Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 22 Mar 2012 14:15:16 +0000 (15:15 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 22 Mar 2012 14:15:16 +0000 (15:15 +0100)
commit8d77ba407637372c68a9328b799c869ee172f8a0
tree294e7f73c3025b0c01e7a31bb5d10d13f6948084
parentd410bfa2365b45eed2c5bcc8b9bf1740dbe96aed
parentacc818b7407d2cd0c118f85b5ecff07d29cd7e6d
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel