Merge remote-tracking branch 'origin/master' into lamp
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 8 Jan 2013 19:20:53 +0000 (20:20 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 8 Jan 2013 19:20:53 +0000 (20:20 +0100)
commitb7416aa72ec663d542ac36f1007d7edc83fe34ae
tree2db940cf17daec3973d35ee36c4ae734d2b99834
parent8b3915a6841ea339ede5c995757d1d99d107fed3
parent572b8e6d8c5966f0c1d61ce646549567ea7b4619
Merge remote-tracking branch 'origin/master' into lamp