Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 12 Feb 2013 15:28:11 +0000 (16:28 +0100)
committerb4silio <b4silio@gmail.com>
Tue, 12 Feb 2013 15:28:11 +0000 (16:28 +0100)
commitaef155f0adc95df9652503a8f65683c927c37afc
tree2f719875260bf087bd82d20dea223f5b99e47dd0
parentf43c8e4bb526b3a1c9263fed7f842c620d3fa0f6
parentabcd5e60b0cb792399bf3c3e45e1cd7cc8cb3508
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel