Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Sat, 10 Dec 2011 15:21:56 +0000 (16:21 +0100)
committerb4silio <b4silio@gmail.com>
Sat, 10 Dec 2011 15:21:56 +0000 (16:21 +0100)
commit585c868e60cef4f49d15e1a3de3b75fbf5aec503
treeb55a96586484020efbe4341bcc48607451b1c91e
parent878c802a36b2eafc27aa55ad9ca6af96077f1c10
parentdcc4e33e3d4b119bcf0a0bd8af7e7a205a9a6054
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel