Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 13 Dec 2012 15:05:33 +0000 (16:05 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 13 Dec 2012 15:05:33 +0000 (16:05 +0100)
commitc4c83e00e1cc5e246b0d422b55acf89f3cbfe8c2
tree1a49e0b4dfe43f615311557b8d9fd9e82b2026b0
parent0de9cd4c7f5f8e5aa920820297bbec70d36c65db
parentbde754b5250f31bb02e058e439c8e2c60de4ee1a
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel