Merge ssh://repo.or.cz/srv/git/azGit
commit34884b351e219db937091237b11617236218bee8
authorVictor B. Gonzalez <git.vcs.id24@vbgunz.com>
Mon, 14 Jan 2008 15:58:08 +0000 (14 10:58 -0500)
committerVictor B. Gonzalez <git.vcs.id24@vbgunz.com>
Mon, 14 Jan 2008 15:58:08 +0000 (14 10:58 -0500)
treeab4521db25b5da7a32e14067b8cc84f2d2c58edb
parentd96a8ab992656f53b2627002664456a076631c70
parent7cd0559c89d10881e55e61f429d5d773bdc61af5
Merge ssh://repo.or.cz/srv/git/azGit

Conflicts:

testfile

the above was written in for me. it seems I cannot pull public the way I
set up the config to push into public. I'll find that setting and change
it and try again. hopefully now, I can keep pushing without a problem...