Merge remote-tracking branch 'origin/master' into lapp-resilient3
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 8 Jan 2013 09:29:10 +0000 (10:29 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 8 Jan 2013 09:29:10 +0000 (10:29 +0100)
commit572b8e6d8c5966f0c1d61ce646549567ea7b4619
tree0e87b0d5488e237dcb433706f1a8cee0767e038f
parent1a31d9602cda0e1af2e4946252c27f7645fa89af
parenta695668be2ffd7d68154f5e19f62bc7b261fe47e
Merge remote-tracking branch 'origin/master' into lapp-resilient3