commit e9c64f144c59eeab2f9596483de919aa76ca2a8a parent 64995e24fe5f9b874b1b99925e7df77ce2af1adb Author: Christian Grothoff <christian@grothoff.org> Date: Sat, 16 Jan 2016 23:56:25 +0100 wq Merge branch 'master' of taler.net:www Former-commit-id: ef7e8f2640caee204620412aeba38170bbb515f0
