[SCM] wiki-content branch, master, updated. 2c5329a90f312ffa10d13c32c908b4f9c4cde46d

[git repository hosting]

The following commit has been merged in the master branch:
commit 3e897f687f61b08f4db2d687457028386449d357
Merge: e609f5f1a7643ac020e35646e0c6c0734e63cc36 6ac83dc0a7ba14d379e7e25a437baaa86ef13945
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Oct 4 09:02:06 2010 +0000

    Merge branch 'master' of /srv/debian.net/live-wiki/../live-git/repositories/wiki-content


-- 
wiki-content