merchant: master bd6275a3

Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-06-03 16:32 master 3ed42689
Changeset Merge branch 'master' of git.taler.net:/var/git/merchant