Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorBasilio <basilio@tsf-wpa-1-1056.epfl.ch>
Tue, 8 May 2012 09:03:39 +0000 (11:03 +0200)
committerBasilio <basilio@tsf-wpa-1-1056.epfl.ch>
Tue, 8 May 2012 09:03:39 +0000 (11:03 +0200)
commite2596987fa88732e5533b4643496254ee14547e3
treef748d35f2923d15512a404ee35939f41e6d281a3
parent20ad5e62d2c595bcdd6a6d9b0f4d6bb45c2a21a1
parentceb1e6b2d385fade0d92f228d61e01c4ca99aa74
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel