Merge branch 'lapp' into lapp-resilient2
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:37:39 +0000 (11:37 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:37:39 +0000 (11:37 +0100)
commit1de09c67b78cb3b67719e017e13a8dfa7730d355
tree413126ef0ca7864efb39eaa389d2a3c119a06fdf
parente53a371d552c3c8feadad35502de72eeb569b336
parentcac4208e2a848a26c1239acd8308fb61f8e64d5b
Merge branch 'lapp' into lapp-resilient2