commit b76568654b8c404083ac11581ed1aa5f7a3313d5 parent ee46829bb9f0f971b728e2224fc4c62085e60f5a 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 Former-commit-id: 67a716075e8d1bc27279a79a6a1f75c67aed3605
