Merge branch 'master' into topic/netvirtsbmerge 06/20206/1
authorSam Hague <shague@redhat.com>
Wed, 13 May 2015 01:19:04 +0000 (21:19 -0400)
committerSam Hague <shague@redhat.com>
Wed, 13 May 2015 01:21:29 +0000 (21:21 -0400)
commit474fc1b4ef010d7ede207c5de9565923f7b7b7e7
treee5aad4b7d8fe47a042ed4f3a4202553b456e9700
parent3a34f2923d070cbfdd672bcca1d3e832564b346c
parent0606a8568104b342c7a7f2b33b05fdde1315bac5
Merge branch 'master' into topic/netvirtsbmerge

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