Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 14 Mar 2012 16:07:09 +0000 (17:07 +0100)
committerb4silio <b4silio@gmail.com>
Wed, 14 Mar 2012 16:07:09 +0000 (17:07 +0100)
commit153c89b84523e8ad92cc61fd898b4475abfa5b47
tree51c1e3111ab170ecb13dafafd63e6b912dd54cc7
parent8309eeee2448c2618c83a27f62e1eba1fc2ca753
parentf21092ad243adc1293d25e97250a8c863fd222fb
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel