Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 9 May 2012 13:00:43 +0000 (15:00 +0200)
committerb4silio <b4silio@gmail.com>
Wed, 9 May 2012 13:00:43 +0000 (15:00 +0200)
commit71d5ec4b74708e621b28cc57d38aff9d3e641b00
tree7fa27daa54f3f5f49bccaa8346e4df6e7a4137ea
parentb4041daa3856671d0321613232403b2f51469fbb
parent561eb07c83dd631e4ee7156c3b354a1836a7c57e
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel