Merge remote-tracking branch 'origin/master' into lapp
authorMarco Mariani <marco.mariani@nexedi.com>
Wed, 24 Oct 2012 12:24:44 +0000 (14:24 +0200)
committerMarco Mariani <marco.mariani@nexedi.com>
Wed, 24 Oct 2012 12:24:44 +0000 (14:24 +0200)
commit3355a8567553aa6bac3fb44366942ffbbe1f98f5
treeba1b0d90c4a2b1259801dc012d4fddedb2f27a4b
parent413b182011752ed533b5e162a66e526f03c4e38c
parentc98cc19a03b12ac609d0005a65171e51f8f85b18
Merge remote-tracking branch 'origin/master' into lapp