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

Trivial merge