Merge branch 'master' into next
commitd260438166326a492548add850112b87c99181dc
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 05:02:06 +0000 (27 22:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 05:02:06 +0000 (27 22:02 -0700)
tree898eed4ed7e901fb2122f1913a240f54f9837815
parent81fb2bd487970a651bdb759db7c99b1c980e985d
parentaab9ea1aad2447522928d7e9af0bb030558012cb
Merge branch 'master' into next

* master:
  Fix overridable written with an extra 'e'
  Documentation: git-archive: mark --format as optional in summary
  Round-down years in "years+months" relative date view
date.c