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

[git repository hosting]

The following commit has been merged in the master branch:
commit a8e1cfb5a1238972258d27dbed5b28700421f94c
Merge: d013ebd6c057398599cd3ef84da347202bc0a277 b6fe94f6f9c0a1882ee3c3247e430e72f9bacef5
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Nov 29 23:21:26 2010 +0000

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


-- 
wiki-content