Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 22 May 2012 14:33:20 +0000 (16:33 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 22 May 2012 14:33:20 +0000 (16:33 +0200)
commitfcf7a0e7daca03d599d314e38e37a071cd2bc68e
tree8423c4eb94113c595f5332741b0a6bc027abacc2
parent9b22b22e8d9fd38b9eb781570e2d5bf90c09d1ec
parentac722cfba6584b5df9cc36ca5e6c25a86548fc83
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel