reproduced https://github.com/porqup1ne/counterpartyd/commit/7af1566ab7a7f2013445d6a82982ed7aa8cd1ce2
Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd into develop
trade assets for themselves
Merge branch 'develop' of https://github.com/CounterpartyXCP/counterpartyd into develop