Merge branch 'feature/memoryleaks'
authorIngo Ruhnke <grumbel@gmail.com>
Tue, 12 Aug 2014 21:07:28 +0000 (23:07 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Tue, 12 Aug 2014 21:07:28 +0000 (23:07 +0200)

Trivial merge