merchant: master e2ecc9cd

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-04-07 16:13 master 7f885d15
Changeset adapting merchant.conf to what the wire-plugin likes
mod - merchant.conf Diff File