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

[git repository hosting]

The following commit has been merged in the master branch:
commit f6cc870a458cb12e8570016f26190ba459518d5c
Merge: 2b58ad637b5097d8de043676bf2644254a351c4d 9ac128e95a93379ee2376e12726a3e458ec47d7c
Author: git repository hosting <gitosis at live.debian.net>
Date:   Fri Nov 26 23:49:22 2010 +0000

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


-- 
wiki-content