Merge branch 'maint'

* maint:
Add Release Notes to prepare for 1.5.0.2
Allow arbitrary number of arguments to git-pack-objects
rerere: do not deal with symlinks.
rerere: do not skip two conflicted paths next to each other.
Don't modify CREDITS-FILE if it hasn't changed.

diff --cc builtin-pack-objects.c
Simple merge

diff --cc builtin-rerere.c
Simple merge