Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 8 May 2012 09:05:40 +0000 (11:05 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 8 May 2012 09:05:40 +0000 (11:05 +0200)
commitb4041daa3856671d0321613232403b2f51469fbb
treecc57e284338fa1f7b1abed374cdaf2eb6329b867
parentdcf2f7f64a98e11b5857d5e4b5a11e44a42a5275
parente2596987fa88732e5533b4643496254ee14547e3
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel