Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Mon, 18 Feb 2013 08:43:06 +0000 (09:43 +0100)
committerb4silio <b4silio@gmail.com>
Mon, 18 Feb 2013 08:43:06 +0000 (09:43 +0100)
commit9fcf6595a05ddb318499b804fdc69822cbd3e922
treef1817ca2988cf3a8e2780fc7c33c5853ee52fba5
parent2fcf6b4ac13a2f88d8179feed9023617ab09c67c
parent60655793b2ba7a2e5312460e08df4e1bdf84031d
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel