Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Fri, 15 Feb 2013 16:03:55 +0000 (17:03 +0100)
committerb4silio <b4silio@gmail.com>
Fri, 15 Feb 2013 16:03:55 +0000 (17:03 +0100)
commit2fcf6b4ac13a2f88d8179feed9023617ab09c67c
tree2b4b4bcf80ef0e54b5999297b9f1a8817b6616ef
parentaef155f0adc95df9652503a8f65683c927c37afc
parent672d512d40cddf5c33d4f5b802d5c8f645b46383
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel