Merge remote-tracking branch 'origin/master' into slapos
authorRafael Monnerat <rafael@nexedi.com>
Thu, 2 Jan 2014 14:59:16 +0000 (15:59 +0100)
committerRafael Monnerat <rafael@nexedi.com>
Thu, 2 Jan 2014 14:59:16 +0000 (15:59 +0100)
commit754d77eeec19a14738cddc4eb0e8185377ebd9bf
tree7f22c7a68335864a40168e0d2dd27bcc7aaeb7a9
parent02bdfdbb984df2b5b9c66dda5a195a1de74f6f68
parent01a467f4c725baa4d8d827a4e28fe1e6778d6e44
Merge remote-tracking branch 'origin/master' into slapos