[glib] (4 commits) Non-fast-forward update to branch vs2012-2-68

[Chun-wei Fan <fanchunwei src gnome org>]

The branch 'vs2012-2-68' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  a634e10... option-context.c: Define NAN if not defined
  65457c4... gsocket.c: Declare variables at the top-of-block
  7e43547... README.win32.md: Add info on roapi.h
  b0627bc... README.win32.md: Restore Visual Studio 2008/2010 support
  4d33776... option-context.c: Define NAN for MSVC only

Commits added to the branch:

  20bd716... option-context.c: Define NAN if not defined on MSVC
  ce66006... gsocket.c: Declare variables at the top-of-block
  a54af2f... README.win32.md: Add info on roapi.h
  8da16a4... README.win32.md: Restore Visual Studio 2008/2010 support