[MERGE] merge bzr server branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:28:48 +0000 (16:28 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 14:28:48 +0000 (16:28 +0200)
commit528d04d6dd8ffa1d1dc5297866d47f8a27d8fe19
treeca2b2eb3e25671d1226b852b51b58ff53da3914c
parenta9ded014b293b406ff72fd6cc1e4a8af239d9dbf
parent066fb143260858ca49091c41d3b0062a12f8e55a
[MERGE] merge bzr server branch