Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 24 Feb 2012 12:19:02 +0000 (13:19 +0100)
committerb4silio <b4silio@gmail.com>
Fri, 24 Feb 2012 12:19:02 +0000 (13:19 +0100)
commit4737df4b4fe183e1ba829e3d4690407eddf648b7
treec2e1bcd6cfd9876232ea6c6af03b1e6d55772f86
parent545cd0c167f0b616a99b272f187f0e3a2016a8e2
parentf12abd8644f9d8b3d330f54c8b2e88901d90aa4b
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel