Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 14:02:04 +0000 (16:02 +0200)
committerb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 14:02:04 +0000 (16:02 +0200)
commit30a3849c34c37f5ff85a5a1ff730c35847bb8d4c
treebb4e434b71aac4b10637ab547db9a60deef06530
parent40dcc5b32993694247c22e5bc98d951c20591823
parenta51b526a16d3de0a2e0a3103e7bf26777cd900b3
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel