Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 1 Jun 2012 14:35:41 +0000 (16:35 +0200)
committerb4silio <b4silio@gmail.com>
Fri, 1 Jun 2012 14:35:41 +0000 (16:35 +0200)
commit486cf377c4f255cd4e530f045b7bba7fe257cfff
tree2aff939b0840d364285eba3ec70a906ea82e3be7
parent3388258196973d4af1ac6aab22ea5de90f3d6ba5
parent21f609da5890b4a883ff27a762d68711aa9a487f
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel