Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 7 Nov 2012 15:51:55 +0000 (16:51 +0100)
committerb4silio <b4silio@gmail.com>
Wed, 7 Nov 2012 15:51:55 +0000 (16:51 +0100)
commit7b1f1f848f1ffddb013f8a27380536b2fcc925c5
treee261fb9765b4eb5faefdb88ba8e0a4462a6cb280
parenta7e37c3f88d17766ff15bc4378d4760e62b21d8e
parentf47b828065e1b7affa258ace25d3222a7ff54ce2
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel