Merge 'master' into generic-lamp
authorAntoine Catton <acatton@tiolive.com>
Wed, 26 Oct 2011 13:20:24 +0000 (15:20 +0200)
committerAntoine Catton <acatton@tiolive.com>
Wed, 26 Oct 2011 13:20:42 +0000 (15:20 +0200)
commit955c95d7690140a1c3fa16f71a0a85644ec9ec58
treecefb723dc39353975befe59e95acce1e10707247
parent0b045be2efd3e2c232db598cd8f128e81a2a9ed1
parent116d2e36f2d9477dab2d5f7e4b763edaa2abe59e
Merge 'master' into generic-lamp
setup.py