Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorBasilio <basilio@tsf-wpa-1-2031.epfl.ch>
Fri, 16 Mar 2012 07:27:00 +0000 (08:27 +0100)
committerBasilio <basilio@tsf-wpa-1-2031.epfl.ch>
Fri, 16 Mar 2012 07:27:00 +0000 (08:27 +0100)
commit86c8c9e68012ab81cb083a6ff153b6a4d4aaad7f
tree04a653ed61c6375ffc7305553d8aec9e40112244
parent203b2f59a6ad9d643e22921829977899ab7c180f
parentcde5cda8532bcf389dd240c5b5ec694726bec937
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel