sync submodules - merchant - Merchant backend to process payments, run by merchants

commit ddc5a9c665246a7b4d3bd05942fcbd7f31de7045
parent e2ecc9cdcd091483e7b251a420728190bdbc1f3f
Author: Florian Dold <florian.dold@gmail.com>
Date:   Thu,  7 Apr 2016 14:23:02 +0200

sync submodules

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