Merge remote-tracking branch 'origin/master' into lapp-resilient3
authorMarco Mariani <marco.mariani@nexedi.com>
Thu, 31 Jan 2013 15:37:51 +0000 (16:37 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Thu, 31 Jan 2013 15:37:51 +0000 (16:37 +0100)
commit69b8c08a910095e13fac987b338461d515f459fe
tree9d321c313c86858ae3d786d7b345d89b4986de90
parent872371ded4cbd4e72758dae02fb9ef873f34e1a7
parent892c532e1d52260a8d504c0d3180f263b59d5b8a
Merge remote-tracking branch 'origin/master' into lapp-resilient3