Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 21 Oct 2011 08:31:16 +0000 (10:31 +0200)
committerb4silio <b4silio@gmail.com>
Fri, 21 Oct 2011 08:31:16 +0000 (10:31 +0200)
commit82643d64184fb2fd48f1dd456ad3d2c24404b60b
tree5662471ab499675e3e5a157f8eddf9fccc149099
parentd04394141627af9ebdd969a380123f14a9ab1be3
parent90f13f3a35340adc797a55b459d07d3314658146
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel