# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1294839004 -3600
# Node ID e70f56fcb80bbb147db3f4138650cbe39ee07897
# Parent  f316fd5e13bf5f5e925be044f9072f9707e605e2# Parent  30b747e3c5d6b9ddb8194324d1cc8dc7d6db62b4
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r f316fd5e13bf -r e70f56fcb80b .gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,2 @@
+conf
+export
diff -r f316fd5e13bf -r e70f56fcb80b db/usr/atiti/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/atiti/git	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,1 @@
+git://1.1.123.1/
diff -r f316fd5e13bf -r e70f56fcb80b git-commit
--- a/git-commit	Wed Jan 12 14:24:42 2011 +0100
+++ b/git-commit	Wed Jan 12 14:30:04 2011 +0100
@@ -1,4 +1,4 @@
 #!/bin/sh
-git add configure db doc git-commit gitd scripts contrib
+git add configure db doc git-commit gitd scripts contrib .gitignore
 git commit
 test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info