Merge remote branch 'shadowcat/master' into sc
Dan Brook [Wed, 14 Apr 2010 15:28:22 +0000 (16:28 +0100)]
Conflicts:
README
lib/Gitalist.pm
root/nav/path.tt2

1  2 
lib/Gitalist.pm

diff --cc lib/Gitalist.pm
Simple merge