Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorBasilio <basilio@tsf-wpa-1-2224.epfl.ch>
Fri, 9 Mar 2012 13:47:43 +0000 (14:47 +0100)
committerBasilio <basilio@tsf-wpa-1-2224.epfl.ch>
Fri, 9 Mar 2012 13:47:43 +0000 (14:47 +0100)
commit247a90cbadaca286522a74e37486fdcd50674eec
tree9c85f736bdbaa0f55cc2c93b7c0e3e63f9f3ee20
parentce936a7ddcb800aa71d581e3ed0b8a992c5f4995
parent89572bddc99cbe74b915fc3a795ef771a99e1734
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel