Merge pull request #1041 from phomes/master
authorDaniel Mack <github@zonque.org>
Tue, 25 Aug 2015 21:48:07 +0000 (23:48 +0200)
committerDaniel Mack <github@zonque.org>
Tue, 25 Aug 2015 21:48:07 +0000 (23:48 +0200)
trivial cleanups


Trivial merge