From: Dan Brook Date: Thu, 19 Nov 2009 18:49:16 +0000 (+0000) Subject: Merge branch 'master' of git://github.com/zts/Gitalist into zts-patches X-Git-Tag: 0.000000_01~20 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f9c75555db463f4e1db60bf7d7b2e505c779ed13;p=catagits%2FGitalist.git Merge branch 'master' of git://github.com/zts/Gitalist into zts-patches Conflicts: lib/Gitalist/Controller/Root.pm --- f9c75555db463f4e1db60bf7d7b2e505c779ed13