Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 21 Oct 2011 07:57:39 +0000 (09:57 +0200)
committerb4silio <b4silio@gmail.com>
Fri, 21 Oct 2011 07:57:39 +0000 (09:57 +0200)
commitd04394141627af9ebdd969a380123f14a9ab1be3
treeb787caca04d92f3aec7e88a536cd7199bb5a425b
parent792e279bd23d8808670456460f5fe8eb3f6710ac
parentb33ddf4928b6ac675b351fae3a45c97d20f1c7ef
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel