Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 07:25:36 +0000 (08:25 +0100)
committerb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 07:25:36 +0000 (08:25 +0100)
commit9a0249367df9bebe9dda9461c1904482620121d5
tree98cdf1d4a7d39e801f8abc623d09b6eed7fa08b5
parent1bcdbdb548b58e28f106ccecc2f3a76ffc78f1b3
parent6ce015feeeb59818b101c2fad5dc636dfd263ba0
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel