Merge branch 'master' into lapp
authorMarco Mariani <marco.mariani@nexedi.com>
Fri, 19 Oct 2012 09:28:52 +0000 (11:28 +0200)
committerMarco Mariani <marco.mariani@nexedi.com>
Fri, 19 Oct 2012 09:28:52 +0000 (11:28 +0200)
commitbb200fed44c570c1dcc8fc548402c920557d229e
tree691a7e3332151849bc55285378d5150c4059c29a
parent1e02ea26027e956531012e4c1649272940879705
parent18305acf278ec452ae7d4311ad1ef748b91f14f2
Merge branch 'master' into lapp