[MERGE] merge bzr saas-3 server branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:41:04 +0000 (16:41 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:41:04 +0000 (16:41 +0200)

Trivial merge