Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 22 May 2012 13:34:18 +0000 (15:34 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 22 May 2012 13:34:18 +0000 (15:34 +0200)
commit9b22b22e8d9fd38b9eb781570e2d5bf90c09d1ec
treeb7d03a2aa99bb6ec6e70f1801a43cc8d20f30841
parentf68131b077f71f932063e1fa050b395a3895ee0d
parenta8c21799216c079522077eefb58c875fd4da62b8
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel