annotate config/.svn/dir-prop-base @ 431:d3af621ba9d4 bug_168

Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author Chris Cannam
date Sun, 05 Jun 2011 10:28:27 +0100
parents 513646585e45
children 0579821a129a
rev   line source
Chris@0 1 K 10
Chris@0 2 svn:ignore
Chris@0 3 V 23
Chris@0 4 database.yml
Chris@0 5 email.yml
Chris@0 6
Chris@0 7 END