[MERGE] merge bzr addons branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:31:43 +0000 (16:31 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:31:43 +0000 (16:31 +0200)

Trivial merge