Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Mon, 18 Feb 2013 09:21:16 +0000 (10:21 +0100)
committerb4silio <b4silio@gmail.com>
Mon, 18 Feb 2013 09:21:16 +0000 (10:21 +0100)
commitaaea68511dec32e8d87506888ba9405d3900eb59
tree160b0abeb7f25fcfec8471ac75d0c9ee4a6e4d53
parent9154fea3a062c096ce8306018e59cbe02f55ce1b
parentf619e7d7d4eab06b7caa9bf6d2db76a95b04fa4f
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel