Merge remote-tracking branch 'remotes/thebluematt/master'

This commit is contained in:
Saivann 2014-08-08 12:43:42 -04:00
commit 4d13d1158d

View file

@ -24,7 +24,6 @@ id: development
<div><div>Gavin Andresen</div><div><a href="mailto:gavinandresen@gmail.com">gavinandresen@gmail.com</a></div><div><a href="/gavinandresen.asc">PGP</a></div></div>
<div><div>Jeff Garzik</div><div><a href="mailto:jgarzik@bitpay.com">jgarzik@bitpay.com</a></div><div><a href="/jgarzik-bitpay.asc">PGP</a></div></div>
<div><div>Gregory Maxwell</div><div><a href="mailto:greg@xiph.org">greg@xiph.org</a></div><div><a href="/gmaxwell.asc">PGP</a></div></div>
<div><div>Satoshi Nakamoto</div><div></div><div><a href="/satoshinakamoto.asc">PGP</a></div></div>
<div><div>Pieter Wuille</div><div><a href="mailto:pieter.wuille@gmail.com">pieter.wuille@gmail.com</a></div><div><a href="/pieterwuille.asc">PGP</a></div></div>
</div>