Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 21 Feb 2013 14:35:48 +0000 (15:35 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 21 Feb 2013 14:35:48 +0000 (15:35 +0100)
commit443506589a9b45fde1a9d4fdfbe27501e653022e
treeed118733cd5059ddd24ff00e5b3e7845e262660c
parentd757e8595c5e0c199ea3b77e9f4082858d8fa067
parent510dbc6bcb9971421869e0f4c0690b4469a62476
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel