Merge https://github.com/ojab/bitcoin into wx-config
authorMatt Giuca <matt.giuca@gmail.com>
Fri, 25 Feb 2011 21:45:38 +0000 (08:45 +1100)
committerMatt Giuca <matt.giuca@gmail.com>
Fri, 25 Feb 2011 21:45:38 +0000 (08:45 +1100)
commit32e94947dc39edc5cb601bd656011f4c8066aacb
treea444cd0f9b8631ada7e4db382740c653525879f2
parentccd7fe8de52bbc9210b444838eefb7ddbc880457
parentf0b7952caaf2500faa3cb6b0ddae8ff41f3cad96
Merge https://github.com/ojab/bitcoin into wx-config