Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 4 Nov 2010 00:24:50 +0000 (20:24 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 4 Nov 2010 00:24:50 +0000 (20:24 -0400)
commitde374ba6b1cda78fd146c675af0e8f05cd2f8624
tree6a6cf00b7e120cbdcb66eb9c4ca99631bc500525
parentbe7eecafd2cea0e3e5f8b21f7f8a81bb2c4d9884
parent3b8848fa4e9b2cd8187cf90a7cbeabd662490c2b
Merge remote branch 'refs/remotes/svn/trunk' into svn