# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1278885896 0
# Node ID aa2c9578679b80357359e3d2dfb4b8b65898c014
# Parent  17b7c922f9fbd838616404904d2abc1e4e6f1cea# Parent  231fe46ab2ecdcd89bd638f0630aa4cbc80aa642
Merge git://1.0.48.100

diff -r 17b7c922f9fb -r aa2c9578679b db/usr/cronix/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/cronix/git	Sun Jul 11 22:04:56 2010 +0000
@@ -0,0 +1,1 @@
+git://1.0.48.100/