Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 7 Nov 2012 15:44:56 +0000 (16:44 +0100)
committerb4silio <b4silio@gmail.com>
Wed, 7 Nov 2012 15:44:56 +0000 (16:44 +0100)
commita7e37c3f88d17766ff15bc4378d4760e62b21d8e
treee54195051788b5c4d2d413b7c31befba0ce7e366
parentb4c7f2a9875a19d67085473749823d3857790043
parent5d88b0a6737bae3efa298efddc628d4310c165e9
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel