Merge branch 'master' of gitorious.org:mldemos/mldemos
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 24 Mar 2011 00:06:08 +0000 (01:06 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 24 Mar 2011 00:06:08 +0000 (01:06 +0100)
commitbbb06e5bbd30f0909773a1cbb27a239cefe028e8
tree48b7d2fad09871fbba43e71d9aa1f012e3f2921b
parentb8bb2e72ab5762bef7ce592d4ec14c024871f419
parent10dad9cc2c9f0d062c9e2ddb30bff1fa7dfc069d
Merge branch 'master' of gitorious.org:mldemos/mldemos
.gitignore