Merge pull request #986 from C-o-r-E/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 19 Feb 2013 22:15:06 +0000 (14:15 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 19 Feb 2013 22:15:06 +0000 (14:15 -0800)
Server improvements on OS X and Windows


Trivial merge