Merge branch 'master' of https://github.com/tianocore/edk2

author Jaben Carsey <jaben.carsey@intel.com>

Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)

committer Jaben Carsey <jaben.carsey@intel.com>

Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)
author Jaben Carsey <jaben.carsey@intel.com>
Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)
committer Jaben Carsey <jaben.carsey@intel.com>
Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)
diff --cc ShellPkg/Library/UefiShellLib/UefiShellLib.c
Simple merge
author	Jaben Carsey <jaben.carsey@intel.com>
	Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)
committer	Jaben Carsey <jaben.carsey@intel.com>
	Wed, 10 Feb 2016 16:56:33 +0000 (08:56 -0800)