Merge branch 'master' into topic/netvirtsb2 71/19271/1
authorSam Hague <shague@redhat.com>
Wed, 29 Apr 2015 00:43:27 +0000 (20:43 -0400)
committerSam Hague <shague@redhat.com>
Wed, 29 Apr 2015 00:43:47 +0000 (20:43 -0400)
commit411cb31714f30c11b4d1d8bd6a29b099f0d0ca90
tree6404601ebfb5bc18c0ce5bc1dfb6aae656de61f1
parent70a965d3e32b0d3105ef72982f82f5563d0311f5
parent2a4f0371c268a944ba942bcdd70f63a33dc8d71a
Merge branch 'master' into topic/netvirtsb2

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