Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 19 Dec 2012 14:17:31 +0000 (15:17 +0100)
committerb4silio <b4silio@gmail.com>
Wed, 19 Dec 2012 14:17:31 +0000 (15:17 +0100)
commit654690f0476300cc4c592b7f54cddbe757b0e0c4
tree72e2afb6f3f785e51fa7d1994c3820a5253a5efb
parent50bf270bbff52f4374c68fc6afb00cb1862f2357
parent64892090c62fc5decefb6ffe717b2c3c511aa820
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel