Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Mon, 26 Mar 2012 12:11:28 +0000 (14:11 +0200)
committerb4silio <b4silio@gmail.com>
Mon, 26 Mar 2012 12:11:28 +0000 (14:11 +0200)
commit073aec0dab30a0220518d2ace3e22d7cf6613ef9
tree191efb74c79ebda9563a37ebb16423379102cc17
parent9d80f7ae92f64425044c81d2ac32ae2929866e50
parent6cc7fd7e981cba5f592a91003f6d0f1ccb5db135
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel