Merge branch 'master' of git.shadowcat.co.uk:Gitalist into shadowcat
broquaint [Thu, 29 Oct 2009 14:57:41 +0000 (14:57 +0000)]
1  2 
gitalist.conf

diff --cc gitalist.conf
Simple merge