Merge remote-tracking branch 'bitcoin.org/master' into generatingtxes

Conflicts:
	_includes/references.md
This commit is contained in:
David A. Harding 2014-06-09 14:04:23 -04:00
commit ba1a33e712
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
25 changed files with 928 additions and 94 deletions

View file

@ -224,7 +224,7 @@ body{
display:inline;
}
.eventtable div div{
.listtable div div{
zoom:1;
display:inline;
}