Wed, 13 Jul 2011 11:48:34 +0200Commiting merge with Mario's repository
laurent [Wed, 13 Jul 2011 11:48:34 +0200] rev 342
Commiting merge with Mario's repository

Mon, 11 Jul 2011 09:47:27 +0100commiting merge with Laurent's repository
Mario de Sousa <msousa@fe.up.pt> [Mon, 11 Jul 2011 09:47:27 +0100] rev 341
commiting merge with Laurent's repository