Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorBasilio <basilio@tsf-wpa-1-6108.epfl.ch>
Thu, 8 Mar 2012 17:56:05 +0000 (18:56 +0100)
committerBasilio <basilio@tsf-wpa-1-6108.epfl.ch>
Thu, 8 Mar 2012 17:56:05 +0000 (18:56 +0100)
commit83d8738e908849f8c56834fb64b0fd92a831527e
tree81eda652d322565eed9752ac4ab8034e89c50138
parent059326dacf96c4b321589c4d0a47b3768bf1c947
parentda62c2f8d7b1778ba1aeb515b041c30f6af87cd9
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel