Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 2 Oct 2012 11:41:20 +0000 (13:41 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 2 Oct 2012 11:41:20 +0000 (13:41 +0200)
commit5b2c174c8ab164a8d55a1a298f8f4d76bfe0f3a4
treec4eb9483dd2483bb7d90df5dbc0b08616b284608
parentbc31aed6641ce0d272fe72c24d29aa9810747623
parent5f7a61b5fbcc8e2bea8f213513791b7a9960fea7
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel