Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 3 Apr 2012 15:45:00 +0000 (17:45 +0200)
committerb4silio <b4silio@gmail.com>
Tue, 3 Apr 2012 15:45:00 +0000 (17:45 +0200)
commit5797cc032aaa08f70e08934543f0a28597e86399
tree44668c3d64c364133c01ee52d20ff6926f78c68d
parent04669e197483da48e49dbf30a9a19bd466ce630a
parent33606fd7649aba21d65e59dfa217946fc6ec69e9
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel