]> xenbits.xensource.com Git - people/iwj/colo-for-testing.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorDon Slutz <dslutz@verizon.com>
Thu, 4 Dec 2014 19:20:00 +0000 (14:20 -0500)
committerDon Slutz <dslutz@verizon.com>
Thu, 4 Dec 2014 19:20:00 +0000 (14:20 -0500)

Trivial merge