-
Committer:
Daniel Manrique
-
Author(s):
Jeff Lane
-
Date:
2015-06-10 08:10:40 UTC
-
mfrom:
(3825.1.3 add-server-vm-whitelist)
-
Revision ID:
daniel_manrique-20150610081040-dl7iqaf94fua7fr3
"automatic merge of lp:~bladernr/checkbox/add-server-vm-whitelist/ by tarmac [r=zyga][bug=][author=bladernr]"