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

[git repository hosting]

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

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


-- 
wiki-content