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

[git repository hosting]

The following commit has been merged in the master branch:
commit 8fc43cd43e12b4351fed6764265b2d9b0aed29bf
Merge: 065e6c2bb1ee9b39ffe8a790db8269ebce4db7f0 122b216ff0941ae7732feef234d40749fb104171
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Dec 27 05:38:41 2010 +0000

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


-- 
wiki-content