Merge branch 'master' into topic/netvirtsb 36/18636/1
authorSam Hague <shague@redhat.com>
Mon, 20 Apr 2015 14:41:23 +0000 (10:41 -0400)
committerSam Hague <shague@redhat.com>
Mon, 20 Apr 2015 14:42:51 +0000 (10:42 -0400)
commitf6e5345b8c2f447a387b3ff0abcc4a5891751f93
treec4a67e4ab31a8687789117c598cb5ff7846d5370
parent1b26c140196e0c42b6cd6092b7637e2a9955edb7
parent117a3bb140ef3b093913de4cc9dc17d53c79d478
Merge branch 'master' into topic/netvirtsb

Change-Id: I6fdc1f6d3f80e3acfc8baf1c5e411815dcd6d7a0
Signed-off-by: Sam Hague <shague@redhat.com>