Merge remote-tracking branch 'origin/lapp' into lapp
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:59:14 +0000 (11:59 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:59:14 +0000 (11:59 +0100)
commit0f3b4c861c2567bee0798c5beb9c972317f4131f
tree272ca61bbd4fc8ae310b938dd9a58127d19dac8c
parent6675b2051c9fd13ebb16bdf0b38c1e34b6beac3a
parentcac4208e2a848a26c1239acd8308fb61f8e64d5b
Merge remote-tracking branch 'origin/lapp' into lapp