[MERGE] merge bzr trunk server branch
authorChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:30:01 +0000 (17:30 +0200)
committerChristophe Simonis <christophe@kn.gl>
Tue, 20 May 2014 15:30:01 +0000 (17:30 +0200)
commitab4c3534def9854ebb57d3405db569d3211f735e
treea50e65b9c7a8f50b56885f1e5e0151ea60a0ce41
parent6808b174c2130b9008025606822c5a0920f6003d
parentd6e407d1ec7b39fd69c492484fe30a6aeade7d82
[MERGE] merge bzr trunk server branch