Merge pull request #1956 from bmiklautz/feat/monolithic
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 10 Jul 2014 21:02:43 +0000 (17:02 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 10 Jul 2014 21:02:43 +0000 (17:02 -0400)
monolithic winpr


Trivial merge