Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Tue, 15 Jan 2013 12:10:08 +0000 (13:10 +0100)
committerb4silio <b4silio@gmail.com>
Tue, 15 Jan 2013 12:10:08 +0000 (13:10 +0100)
commitf355c4075fc634381ac244660f76e90825231909
tree8648194d07e73415fa95164d78506a7a80452c82
parent756e9a03e9ea9e07769ea3f823dfa86459633146
parented73f12c489e085fb42c3b451706f79e27ca8a04
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel