ARMORY-112 ARMORY-110 Lockbox support for P2SH
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel