Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorBasilio <basilio@tsf-wpa-1-4096.epfl.ch>
Mon, 23 Apr 2012 08:58:06 +0000 (10:58 +0200)
committerBasilio <basilio@tsf-wpa-1-4096.epfl.ch>
Mon, 23 Apr 2012 08:58:06 +0000 (10:58 +0200)
commitf409ac625e04460c4ea5ffcde62505d18e9f4594
tree84eaad4fc9e2584799b13ed4b63e3b29969383e2
parent8c4d47fd4da07292a4dec01f0785f7d1458969a2
parent8fe77deb7ce9395bda812e7ad047edd6bf3b6866
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel