Merge branch 'maint'
* maint: Start preparing for 1.7.4.4 pull: do not clobber untracked files on initial pull compat: add missing #include <sys/resource.h> Conflicts: RelNotes
Junio C Hamano committed
Apr 3, 2011 at 13:53 UTC
44bc573436c98b7c6cd798af04c538f6e76f0f6e
No changes.