Merge pull request #1646 from rubenk/cleanup-malloc-calls
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 2 Apr 2016 10:33:11 +0000 (12:33 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 2 Apr 2016 10:33:11 +0000 (12:33 +0200)
Cleanup malloc calls


Trivial merge