Merge branch 'master' into '1.0'
authorRafael Monnerat <rafael@nexedi.com>
Mon, 17 Aug 2015 17:10:09 +0000 (19:10 +0200)
committerRafael Monnerat <rafael@nexedi.com>
Mon, 17 Aug 2015 17:10:09 +0000 (19:10 +0200)
commit1ea59181cddfe9261ce7b3d58231c4d1fc7db250
tree11ee57f364d66cca77e5a55ea2e8fb568d36cca9
parent8897634306017caa0c658528eccc1e233879f1d0
parent72d9060351571ddb10c3db64628b00110ba3f3a0
Merge branch 'master' into '1.0'

Master

Release Candidate

See merge request !14