Merge pull request #1679 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 5 Feb 2014 18:49:38 +0000 (13:49 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 5 Feb 2014 18:49:38 +0000 (13:49 -0500)
Robustness, WinPR, Codecs, CMake


Trivial merge