Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Sun, 11 Mar 2012 12:07:58 +0000 (13:07 +0100)
committerb4silio <b4silio@gmail.com>
Sun, 11 Mar 2012 12:07:58 +0000 (13:07 +0100)
commit8309eeee2448c2618c83a27f62e1eba1fc2ca753
tree43d22a155c62096d9d04898214e4782bb9ed12c9
parentd756f04962c3bb0b208f1195f25b2abdf63e1085
parentd1864a6d8a3ec8457f26fea930e1b2056870fc3f
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel