Merge branch 'bip23_basic'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 10:07:24 +0000 (10:07 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 10:07:24 +0000 (10:07 +0000)

Trivial merge