From: Don Slutz <dslutz@verizon.com>
Date: Wed, 10 Dec 2014 16:40:57 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=10b21216a05b5ad5b56af73b46f2f14cca5ed4e7;p=people%2Fiwj%2Fcolo-for-testing.git

Merge remote-tracking branch 'origin/master'

Conflicts:
	selections.xlsx
---

10b21216a05b5ad5b56af73b46f2f14cca5ed4e7