Merge branch 'master' of gitorious.org:mldemos/mldemos
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 24 Mar 2011 02:42:05 +0000 (03:42 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 24 Mar 2011 02:42:05 +0000 (03:42 +0100)
commit03046627b078cc145b47ae14c01e0a790079d74d
tree40e92627f4f810060bf328bdc028ba6b9e2853a4
parent497e6f3a5036ac95cec38f414226cd8f033b9c0b
parentf9b9a5bfb8221d0ea40c4c5eb8c061ffa9400853
Merge branch 'master' of gitorious.org:mldemos/mldemos