Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel
authorb4silio <basilio.noris@gmail.com>
Wed, 27 Feb 2013 09:22:13 +0000 (10:22 +0100)
committerb4silio <basilio.noris@gmail.com>
Wed, 27 Feb 2013 09:22:13 +0000 (10:22 +0100)
commitdd40397272f0c261f894e1f47b9abdc81c68a9fb
treeaa72054a7cda1507f8018d2b04b503a422003234
parent141a19355af075d604381cf1d1385be1bf28a8f3
parentc6a430e98023bc9cfd34dab01bfb52f4562bb0ca
Merge branch 'devel' of git.gitorious.org:mldemos/mldemos into devel