Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 4 May 2012 12:12:04 +0000 (14:12 +0200)
committerb4silio <b4silio@gmail.com>
Fri, 4 May 2012 12:12:04 +0000 (14:12 +0200)
commitdcf2f7f64a98e11b5857d5e4b5a11e44a42a5275
treeb574e1d4c0f1b32b2f4e6792d8a10309313da666
parent3f035564003eb11e17f45fd05ffa85ed38875516
parentd3ef298b5c82b63a69658fc165ee7949bc11e46b
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel