Merge branch 'master' into release
authorEvan Martin <martine@danga.com>
Thu, 16 May 2013 23:23:29 +0000 (16:23 -0700)
committerEvan Martin <martine@danga.com>
Thu, 16 May 2013 23:23:29 +0000 (16:23 -0700)
commitddb21217f90e2fc6639d68b240ad2fc394b2dc6c
treeb72aa49307eb6d4e9fd0781ae3202261b127c4e8
parentd0d199e99fe6648c3994ecbbe0c7927065b22d16
parent31ef1415f208e04000424e6fc446fe4377bc7ed3
Merge branch 'master' into release
doc/manual.asciidoc
src/version.cc