merchant-frontend-examples

commit 9d7c818c56b6a27dd5a3b8e2f66127a36147ee8b
parent 679a3046fe18d013222295946ceba03529b24248
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue,  6 Dec 2016 21:54:26 +0100

Merge branch 'master' of taler.net:merchant-frontend-examples

Conflicts:
	php/doc/tutorial.texi