Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 8 Dec 2011 15:44:21 +0000 (16:44 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 8 Dec 2011 15:44:21 +0000 (16:44 +0100)
commit878c802a36b2eafc27aa55ad9ca6af96077f1c10
tree36f4d134a053050dc731aeb9703895272edcd225
parent9a1591a66214f0df415b8cf5151003952cad76a0
parentf63caf71c00d0c4ffd8bb291d335809d7263584f
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel