Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 24 Nov 2011 15:17:28 +0000 (16:17 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 24 Nov 2011 15:17:28 +0000 (16:17 +0100)
commit54c3aef6bc986053fa34776a4210361c2185f463
tree27c7df5a007ffb550d182b816ce9e9fc72c9bb94
parent244f4c885fd0c955ef7cff4971e97782b815bc49
parent9b56603d80003ed3bf2e2e3672ac3fd46d8702f5
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel