Merge branch 'master' into lamp
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 25 Jan 2012 14:46:02 +0000 (15:46 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 25 Jan 2012 14:46:02 +0000 (15:46 +0100)
commit92c07b0849430263678fd7acf3ef40c812e90c66
treeafd5a51ce8680af0b4192f41d7247f895521c1f2
parent3bf73b89750102ec1fe802e70f7e7ce465437632
parent9af739e01a6034dff8532fc31f1422d330c7318c
Merge branch 'master' into lamp