Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 15 Nov 2012 17:08:07 +0000 (18:08 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 15 Nov 2012 17:08:07 +0000 (18:08 +0100)
commit0de9cd4c7f5f8e5aa920820297bbec70d36c65db
tree60ba4ce853cd5c03d17371123b2f2dfc189e1912
parent7b1f1f848f1ffddb013f8a27380536b2fcc925c5
parentb2fb3f3c0d739cdce2a90f12e1f35cf189c9d166
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel