Merge pull request #416 from lordcrc/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 10 Feb 2012 23:44:13 +0000 (15:44 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 10 Feb 2012 23:44:13 +0000 (15:44 -0800)
Proper thread shutdown for server


Trivial merge