Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 10 Nov 2011 16:55:13 +0000 (17:55 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 10 Nov 2011 16:55:13 +0000 (17:55 +0100)
commit7f808cd4cdfc00fa9014ed0532a9485a0701a97a
treec79c1cbb2c574b39df0e5747d7194f6148f749c0
parentc062e658880f1e81a8cf7783c47bfb16c23e684c
parent0a332da70b9154bfd984d410d1bccf2ab019570a
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel