[MERGE] merge bzr saas-4 server branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:05:25 +0000 (17:05 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:05:25 +0000 (17:05 +0200)

Trivial merge