Merge pull request #6990
commitdbd2c135ddb96bdc3a4e870c2371cb1fac227135
authorGregory Maxwell <greg@xiph.org>
Fri, 13 Nov 2015 19:29:33 +0000 (13 11:29 -0800)
committerGregory Maxwell <greg@xiph.org>
Fri, 13 Nov 2015 19:30:00 +0000 (13 11:30 -0800)
treed37ef356cf90aaa62b4a107c9f9065c62728ee9e
parentd3565604e3d94c074ee3f79b61dee9610b870a4c
parenta264c32e3321ae909ca59cb8ce8bf5d812dbc4e1
Merge pull request #6990

a264c32 http: speed up shutdown (Wladimir J. van der Laan)
src/init.cpp