Merge branch 'fix-warnings'
commit625f57c555610160d4db7c47a923dcdf829dad72
authorSven Strickroth <email@cs-ware.de>
Sun, 17 May 2015 10:14:22 +0000 (17 12:14 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 17 May 2015 10:14:22 +0000 (17 12:14 +0200)
tree1838a3aad6649af666483a8aebbf418247cec661
parentd9111740e0574b0010d6cbec4228580f41744c6d
parentdb0d4d8d2ff9cd1b5bb476918b67b529c5847c6d
Merge branch 'fix-warnings'