Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 13:21:02 +0000 (14:21 +0100)
committerb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 13:21:02 +0000 (14:21 +0100)
commit2b9df1af14cd05ef5bcab1d5639194755dfd7856
tree83904838193820d9f042c2bbdea151803c375063
parent9a0249367df9bebe9dda9461c1904482620121d5
parentfa26e66664f53d4b2d791132be5df8ab7e9ddaf7
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel