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

[git repository hosting]

The following commit has been merged in the master branch:
commit 48526365583f2d71e0a40d3b1291095603c9ce57
Merge: e35ade4b95f39aa7751cbddad04188a991826711 d4f9978c2f97f15e99196549f8b811bc09d7e42c
Author: git repository hosting <gitosis at live.debian.net>
Date:   Wed Nov 17 07:47:02 2010 +0000

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


-- 
wiki-content