[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)
commitb09b6a06b10a25630b4ace62ad3e82a40941d967
tree70e98f2201b6522786562f51acdf04c134ee40c3
parent528d04d6dd8ffa1d1dc5297866d47f8a27d8fe19
parentd88ecfa970fbd66507180ec3e8a970ca8c0613be
[MERGE] merge bzr addons branch