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

commit c0bb4dbc4974ad7463861aecaea05c80fc6f894b
parent bcc91379d8086df84003923cd16f9bd06328003a
Author: G.B <greta.brev@outlook.com>
Date:   Sun, 22 Mar 2015 12:38:31 +0100

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

	taler-www Main taler.net website
	Log \| Files \| Refs \| Submodules \| README \| LICENSE