Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 9 Oct 2012 09:11:45 +0000 (11:11 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 9 Oct 2012 09:11:45 +0000 (11:11 +0200)
commit1dab0704601b8658867b0514546838dc4d53242e
tree8dee51b3b2673954485a8cf5e0e4ee902a452d22
parent5b2c174c8ab164a8d55a1a298f8f4d76bfe0f3a4
parent839ca2b607d91295aa8052849d77036fc1036ee7
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel