Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 25 Apr 2012 20:36:19 +0000 (22:36 +0200)
committerb4silio <b4silio@gmail.com>
Wed, 25 Apr 2012 20:36:19 +0000 (22:36 +0200)
commit6e2e64307815d0791515a8c6b7a287a54dfcbf82
tree68b9a91308990a8aa0f0b9263069d29a4d33734b
parent9e22e14f6d55aee7cc6f305acba3a5b9e986325c
parentc70eae1577c340bd6b12a2dc8fd3072bbf6e4b72
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel