Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 15:42:12 +0000 (17:42 +0200)
committerb4silio <b4silio@gmail.com>
Thu, 20 Oct 2011 15:42:12 +0000 (17:42 +0200)
commit792e279bd23d8808670456460f5fe8eb3f6710ac
tree47ef5ddf82c030c36fd4f431104b7515d8d8b68a
parent30a3849c34c37f5ff85a5a1ff730c35847bb8d4c
parent50c0679deec954fb76bfc64499d6accac3979d34
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel