Merge remote-tracking branch 'origin/master' into lapp
authorMarco Mariani <marco.mariani@nexedi.com>
Wed, 3 Oct 2012 12:49:25 +0000 (14:49 +0200)
committerMarco Mariani <marco.mariani@nexedi.com>
Wed, 3 Oct 2012 12:49:25 +0000 (14:49 +0200)
commitcd974ce11cd4260134ee6314a96cbe4978f0f21e
treeb293f8d00d0ca314674ac644fa4fc28c112096f9
parent482b8ee169af45642a5213c4e17c1cc077cc83c0
parentbe9d586f7d6a2ecd5d262cdf44a804bcb7ce13bf
Merge remote-tracking branch 'origin/master' into lapp
setup.py