Merge branch 'master' into gitorious
authorOlivier Berger <olivier.berger@it-sudparis.eu>
Mon, 14 Feb 2011 08:42:58 +0000 (09:42 +0100)
committerOlivier Berger <olivier.berger@it-sudparis.eu>
Mon, 14 Feb 2011 08:42:58 +0000 (09:42 +0100)
commitfd783437d09797029e4107219a090cd171050643
tree3de51e73d54f54c2716c43e337ac3a79bbdcb8b7
parent29f02376151030805b59a71b0f7319b115167bf4
parent54e12d21494d8e96a98d3deaa2d67bf988a55fd2
Merge branch 'master' into gitorious