Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 28 Dec 2010 21:21:30 +0000 (22:21 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 28 Dec 2010 21:21:30 +0000 (22:21 +0100)
commitb86e9a57515f7683112b917e8b235650759e93ec
treec5c9436ea355e08765d6de8d0b3ba12d52f1b80e
parentef677cb74685023930f83530ef58acbb4ec8e507
parent2d89ec936167033886ae76b153605d7ccf19bc20
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

Conflicts:
templates/skin/common.title.header.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
templates/skin/common.title.header.tpl