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

[git repository hosting]

The following commit has been merged in the master branch:
commit 7525b1bc579ee4ba9fdab6da4c54da37de672caa
Merge: d5d19c48d23187c4b6ccaf7bb5e5fbe7631c8c9e e4a1935616ad34a56f25846ce5ad6945f4b2aed9
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Dec 20 11:31:58 2010 +0000

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


-- 
wiki-content