Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 22 May 2012 11:34:53 +0000 (13:34 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 22 May 2012 11:34:53 +0000 (13:34 +0200)
commitf68131b077f71f932063e1fa050b395a3895ee0d
tree3b765b6a20c69ebf3f82f78ab4afe5cb2e116a97
parentfc7bc1e33d3a522da1829e8a1d24bb9574637c74
parent8edda4866c0229553bff2606f6b8e1e4b1498358
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel