Merge branch 'maint'

gitster · gitster · commit 7e94805db2a6 · 2010-02-13T15:14:04.000-08:00
* maint:
  Start 1.7.0 maintenance track

Conflicts:
	RelNotes
diff --git a/Documentation/RelNotes-1.7.0.1.txt b/Documentation/RelNotes-1.7.0.1.txt
@@ -0,0 +1,11 @@
+Git v1.7.0.1 Release Notes
+==========================
+
+Fixes since v1.7.0
+------------------
+
+--
+exec >/var/tmp/1
+echo O=$(git describe)
+O=v1.7.0
+git shortlog $O..
