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

[git repository hosting]

The following commit has been merged in the master branch:
commit 8b59541a02695b0f67b1696f5d918073404c9574
Merge: 81bc0c02d45f481b87c32b57d5cc0beeb97fae25 c18416fa2f8cf942337137e00ce8f3bb2661c880
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Oct 18 11:21:06 2010 +0000

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


-- 
wiki-content