Commit a4221ccb099a11c020797ee199af01caa3cdd017

Edward Thomson 2014-11-17T16:36:54

Merge pull request #2699 from swisspol/fix_warnings Fixed a couple Clang warnings