Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 10 May 2012 13:23:30 +0000 (15:23 +0200)
committerb4silio <b4silio@gmail.com>
Thu, 10 May 2012 13:23:30 +0000 (15:23 +0200)
commitfc7bc1e33d3a522da1829e8a1d24bb9574637c74
tree1292760eb94b08337f4200843c47ebffae2bff85
parent71d5ec4b74708e621b28cc57d38aff9d3e641b00
parentcd7fc9e8929f1ae25e885c5b4783538f9b1942bb
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel