Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 25 Apr 2012 08:49:02 +0000 (10:49 +0200)
committerb4silio <b4silio@gmail.com>
Wed, 25 Apr 2012 08:49:02 +0000 (10:49 +0200)
commit9e22e14f6d55aee7cc6f305acba3a5b9e986325c
treeef631cf8193376cdaa0c70fb03b35a219158ab9e
parent5797cc032aaa08f70e08934543f0a28597e86399
parent9c6f1763b5c3fc1d8273a0392ffa5b0a43ff4da6
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel