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

[git repository hosting]

The following commit has been merged in the master branch:
commit 065e6c2bb1ee9b39ffe8a790db8269ebce4db7f0
Merge: 7525b1bc579ee4ba9fdab6da4c54da37de672caa 9d4c2c9b7de87139dd14babb6ad9d063dfa8c4c5
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Dec 20 19:50:20 2010 +0000

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


-- 
wiki-content