Merge pull request #498 from hogthrob/edge

Added support for Win32 git version string generation
Merge remote-tracking branch 'upstream/edge' into edge