Merge branch '2.0.x-stable'
commit86d2a22ffdc4bf9f16e1870f9db9a2ff84760c7c
authorEric Wong <normalperson@yhbt.net>
Wed, 17 Nov 2010 23:48:12 +0000 (18 07:48 +0800)
committerEric Wong <normalperson@yhbt.net>
Wed, 17 Nov 2010 23:48:12 +0000 (18 07:48 +0800)
tree0648a1bc485af665d155c0d35dd8526f64e42d83
parenteda408603edc51f10f17217c767b31a45eb6c627
parent268c2ec5fef2630b0626b848be9d6ec46d360ddb
Merge branch '2.0.x-stable'

* 2.0.x-stable:
  unicorn 2.0.1 - fix errors in error handling
  tests: add parser error test from Rainbows!
  http_server: fix HttpParserError constant resolution
  t0012: fix race condition in reload