Merge branch 'master' of gitorious.org:mldemos/mldemos
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Wed, 23 Mar 2011 18:40:53 +0000 (19:40 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Wed, 23 Mar 2011 18:40:53 +0000 (19:40 +0100)
commit8d243ffebba78ba3a366f010856e0daa1ba21f9c
treef789658c858ec17405373c4b35818c541714c699
parent930fcd01493dccb343f2cdb10bf476c3f99762b9
parent558358ed5ae509a3149a07fbdc8e1b82d39459b7
Merge branch 'master' of gitorious.org:mldemos/mldemos