Merge pull request #2261 from akallabeth/more_memleak_fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 11 Dec 2014 13:28:48 +0000 (08:28 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 11 Dec 2014 13:28:48 +0000 (08:28 -0500)
More warning and memleak fixes


Trivial merge