]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Merge branch 'lorea-preprod' of gitorious.org:lorea/elgg into lorea-preprod
authorroot <root@ops.vz.lan>
Mon, 5 Nov 2012 08:52:12 +0000 (08:52 +0000)
committerroot <root@ops.vz.lan>
Mon, 5 Nov 2012 08:52:12 +0000 (08:52 +0000)

Trivial merge