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

[git repository hosting]

The following commit has been merged in the master branch:
commit f67ab61d36bbd6392a8a371b8fa0306253814600
Merge: 29e8664226c799430d7f7563906d1969878dd6f3 66bc49f4d3812eba9abb8bfcbcfbe4f7ab57b176
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Dec 6 16:31:34 2010 +0000

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


-- 
wiki-content