Merge remote-tracking branch 'origin/master' into lapp-resilient3
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 18 Dec 2012 14:30:33 +0000 (15:30 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 18 Dec 2012 14:30:33 +0000 (15:30 +0100)
commitd760665fa2f7f7c8fbde610734279ea0d5ec11c5
tree138dac38629d72c6f6cbdcc51cda8bef799ee94d
parent10f72b63a05d5b52c4cf22349e10a32383b516a1
parentc5c304b10173545a887afee94ebcec439756824c
Merge remote-tracking branch 'origin/master' into lapp-resilient3