Merge branch 'devel' of https://git.gitorious.org/mldemos/mldemos
authorotpal <otpal.vitoz@gmail.com>
Tue, 24 Apr 2012 13:15:48 +0000 (15:15 +0200)
committerotpal <otpal.vitoz@gmail.com>
Tue, 24 Apr 2012 13:15:48 +0000 (15:15 +0200)
commitb9675b1f9abf74796aed86522d6fc001b6c6474a
treef7e8333dcd3e3dfcb53bdccd62ace97c7543cc5a
parentbe5ab0cb39a6ed099e51fd3ad969264209ed8037
parentc0d43c56c01a6834814f11bdda8484d4a82840e0
Merge branch 'devel' of https://git.gitorious.org/mldemos/mldemos