Merge branch 're6st-master'
authorRafael Monnerat <rafael@nexedi.com>
Fri, 5 Jun 2015 12:25:53 +0000 (14:25 +0200)
committerRafael Monnerat <rafael@nexedi.com>
Fri, 5 Jun 2015 12:25:53 +0000 (14:25 +0200)
commit2eee45d91e4dd72794c10c685251fbe478f0f56e
tree50e7a67a755d1b17361421887268eb6f3e57731c
parent8fe2ce405868aea7a2007903f6743ddbf6beeda2
parenteac6c83262930a0e5da0a2a11c8178af431c02fa
Merge branch 're6st-master'