Merge remote-tracking branch 'origin/master' into lapp-resilient2
authorMarco Mariani <marco.mariani@nexedi.com>
Mon, 26 Nov 2012 16:04:03 +0000 (17:04 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Mon, 26 Nov 2012 16:04:03 +0000 (17:04 +0100)
commitc23bb65f711ffb12419274dbc32e8ba588e7902f
tree8ce77d3897c8843e7d2e66000561fab04188fcaf
parent8f1af741592c149b8148f82da195f17b8821dd44
parentf0965b8b1d6a74e329a55d152389c2978f8fafe2
Merge remote-tracking branch 'origin/master' into lapp-resilient2