Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 15 Dec 2011 16:25:33 +0000 (17:25 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 15 Dec 2011 16:25:33 +0000 (17:25 +0100)
commit4841dac76a18ae8db275c8622ea05a1a8e7756b4
tree4e0bae80f1c46d2af59af4d81c9c9a45b975b70e
parent585c868e60cef4f49d15e1a3de3b75fbf5aec503
parenta809e4c4a9a2f5c2006fae15d92d8c7c7a6f9aec
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel