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

[git repository hosting]

The following commit has been merged in the master branch:
commit d013ebd6c057398599cd3ef84da347202bc0a277
Merge: f6cc870a458cb12e8570016f26190ba459518d5c a962346a0e0e20a7c1625f67501283a5d084fe19
Author: git repository hosting <gitosis at live.debian.net>
Date:   Fri Nov 26 23:56:15 2010 +0000

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


-- 
wiki-content