Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere

Junio C Hamano committed Jan 6, 2012 at 12:35 UTC 8769e93327f5efc26d179d794a67a5b993cd3693

No changes.