Autogenerated PortableGit for 48623a0db4c619243ba13362004b86c736df3658
Autogenerated PortableGit for 0f65d050d0c352fd38a0b25d82ee942deb19ef87
Autogenerated PortableGit for fed20eba68b3e238e49a47cdfed0a45783d93651
Merge branch 'upstream'

Conflicts:
	etc/gitconfig

GitHub added refs for pull requests in the upstream; I've had issues
  with this setup on other machines, so I've left that change out.