Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 8 Mar 2012 13:32:45 +0000 (14:32 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 8 Mar 2012 13:32:45 +0000 (14:32 +0100)
commit0be9e60bcc89b576096426d44be8bb457c723eaf
tree24397d009dde9a9c34e53bc679ce063d0107bc0d
parent590714764afdebf91dbb8317636efd7775f02dc5
parent27154369698d4016a45237bb85269263b85ba986
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel