Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 21:15:12 +0000 (13:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 21:15:12 +0000 (13:15 -0800)
* master:
GIT 1.2.0
Fix "test: unexpected operator" on bsd

Trivial merge