Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 18:15:39 +0000 (19:15 +0100)
committerb4silio <b4silio@gmail.com>
Fri, 2 Dec 2011 18:15:39 +0000 (19:15 +0100)
commit9a1591a66214f0df415b8cf5151003952cad76a0
treeee35cc44c4a1a6d82d94a3bbf9603e929863d3fc
parent2b9df1af14cd05ef5bcab1d5639194755dfd7856
parent77b07220cfe9d464f33cb1f079d06ef675fcb4dc
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel