Merge branch 'lapp' into lapp-resilient2
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 11:00:32 +0000 (12:00 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 11:00:32 +0000 (12:00 +0100)
commitd6a9aaa40e3f14fb734b153efed16e144a80cd70
tree2bf1b14520fb299f3b2be7a86f930f243491df4f
parent1de09c67b78cb3b67719e017e13a8dfa7730d355
parent0f3b4c861c2567bee0798c5beb9c972317f4131f
Merge branch 'lapp' into lapp-resilient2