Merge branch 'master' of git.taler.net:/var/git/merchant - merchant - Merchant backend to process payments, run by merchants

commit bd6275a39a40c302dfa889339238b884b2265c89
parent 0ee871ed2d39934ccbd0c8183a78a66d9349aab8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  3 Jun 2016 14:32:32 +0200

Merge branch 'master' of git.taler.net:/var/git/merchant

	merchant Merchant backend to process payments, run by merchants
	Log \| Files \| Refs \| Submodules \| README \| LICENSE