Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 09:31:20 +0000 (11:31 +0200)
committerb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 09:31:20 +0000 (11:31 +0200)
commit40dcc5b32993694247c22e5bc98d951c20591823
tree9e85c0b159c42a9cd014179d4a74ab6b6ab43ef8
parent4d050bf6522c84348bcadd94e1a504a628b700c8
parentab592abdb0a85ded866b10cea0bdc3ad79b5edbd
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel