Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 15 Jan 2013 12:49:16 +0000 (13:49 +0100)
committerb4silio <b4silio@gmail.com>
Tue, 15 Jan 2013 12:49:16 +0000 (13:49 +0100)
commitf43c8e4bb526b3a1c9263fed7f842c620d3fa0f6
tree1114b2adb93b58fb9523d6dda4920a5e03df66a6
parentf355c4075fc634381ac244660f76e90825231909
parentafbd35e8fd49db4f4d8c57150988b3968077ddc9
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel