Merge branch 'bip22'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 10:02:32 +0000 (10:02 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 10:02:32 +0000 (10:02 +0000)
commit96f037aa372cc54be9a12e1355708c461c62d56b
treef329e5e6eb33caeb9626b89dd4b5f3ff4d5c8b98
parent4fe55ee68adfb8dbbb055dae531d8cc3d2673efc
parent0e668bbba9ffa93434c93a13006013ed5abcf1c2
Merge branch 'bip22'