Merge branch 'Sc00bz-patch-1' into prerelease
commit4c87a22299b8a6165b6ab9bae8b927f5c7d761ac
authorNick Parker <nparker@zetetic.net>
Wed, 27 Jan 2016 19:35:05 +0000 (27 13:35 -0600)
committerNick Parker <nparker@zetetic.net>
Wed, 27 Jan 2016 19:35:05 +0000 (27 13:35 -0600)
treec9485b157fcb462ec8582bbb9534c68e20a009e3
parent4216a5f24596743418c9507a58ffa9e1cb6709a7
parenta5d41bf0ade6f69b2fbfb9e79451101e4c236bac
Merge branch 'Sc00bz-patch-1' into prerelease