Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 28 Mar 2012 14:06:52 +0000 (16:06 +0200)
committerb4silio <b4silio@gmail.com>
Wed, 28 Mar 2012 14:06:52 +0000 (16:06 +0200)
commit04669e197483da48e49dbf30a9a19bd466ce630a
tree96af6956db8ec4d0b4caf6048e02ab63e2ad9073
parent9a519f66b91c76b59f42ed73d38c3222c791829f
parent593e17dd03f9460213da124fae4558e2c84c5e68
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel