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

[git repository hosting]

The following commit has been merged in the master branch:
commit c371fe3df94a6142cb3d64bef76a0c036361fc86
Merge: 0ffe46c32ef4a71af87078be74b526bd6693f2a3 69366fe3e4dd8a909d61af7db4355b7f11319807
Author: git repository hosting <gitosis at live.debian.net>
Date:   Tue Nov 9 10:11:13 2010 +0000

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


-- 
wiki-content