Commit Graph

2 Commits

Author SHA1 Message Date
Wladimir J. van der Laan a0d2f9a12d Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
	.gitignore
2011-09-07 18:57:11 +02:00
Wladimir J. van der Laan a24b23622e move README.md out of the way for now 2011-07-15 15:42:02 +02:00