Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 23 Feb 2012 16:46:16 +0000 (17:46 +0100)
committerb4silio <b4silio@gmail.com>
Thu, 23 Feb 2012 16:46:16 +0000 (17:46 +0100)
commit545cd0c167f0b616a99b272f187f0e3a2016a8e2
tree01331685605648a1e98e86a9a4fe961be9a83194
parent4841dac76a18ae8db275c8622ea05a1a8e7756b4
parent74cc7f1df25a9b81ddc66b2a74d5eba501d5916c
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel