Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 23 Nov 2010 20:01:34 +0000 (15:01 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 23 Nov 2010 20:01:34 +0000 (15:01 -0500)
commit94073ecf7b1e605628872176e14a25409e4857c2
tree6b5f80fce805a27ee0bb9053783805bbea474940
parent262430f705501011dfada435dd1a9240e5311819
parent776d0f34595fd616129d4816a337662ff39de7c6
Merge remote branch 'refs/remotes/svn/trunk' into svn