Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 29 Mar 2012 07:23:36 +0000 (09:23 +0200)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 29 Mar 2012 07:23:36 +0000 (09:23 +0200)
commit7852c86e07d3a81128710eb97b0068aaa866fbb6
tree7c5ca02b6b35cd117ba2045f65a1a37dbefab4c5
parent8d77ba407637372c68a9328b799c869ee172f8a0
parent593e17dd03f9460213da124fae4558e2c84c5e68
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel