Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 8 Mar 2012 18:03:53 +0000 (19:03 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 8 Mar 2012 18:03:53 +0000 (19:03 +0100)
commit6df204f3166a9ec43476e898c5bac8d74ca8f219
tree4d5dac5d1f25d9282359bded6decc2d84ec9beb5
parent0be9e60bcc89b576096426d44be8bb457c723eaf
parent5cae7debf80a1c1b60f7490be127f59f7715ad21
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel