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

[git repository hosting]

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

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


-- 
wiki-content