Merge pull request #2725 from akallabeth/warning_fixes_more_more_more
authorHardening <rdp.effort@gmail.com>
Tue, 23 Jun 2015 17:32:26 +0000 (19:32 +0200)
committerHardening <rdp.effort@gmail.com>
Tue, 23 Jun 2015 17:32:26 +0000 (19:32 +0200)
Warning fixes more more more


Trivial merge