Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 19 Dec 2012 13:12:39 +0000 (14:12 +0100)
committerb4silio <b4silio@gmail.com>
Wed, 19 Dec 2012 13:12:39 +0000 (14:12 +0100)
commit50bf270bbff52f4374c68fc6afb00cb1862f2357
treef428efd661082d8a4c317cafdda909bd38d8613b
parentc4c83e00e1cc5e246b0d422b55acf89f3cbfe8c2
parent4c02ac88a5dd1420a99571bef5a13f7f1be3735a
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel