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

commit c332698763e6f9b80e3539029402ddbc1c9e8900
parent 6f2f6b3ec4b0819041b17035ae849cdfdbbd41b4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 19 Mar 2016 16:23:48 +0100

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

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