commit 6d9347b4d00b9383604e8f3420a16f5fee45abc4 parent 89a116626146493c36d11822ede6e01959e7645c Author: Marcello Stanisci <marcello.stanisci@inria.fr> Date: Wed, 21 Dec 2016 22:44:46 +0100 Merge branch 'master' of ssh://taler.net/api Conflicts: deployment.rst