~zyga/checkbox/packaging-trunk

Committer: Tarmac
Author(s): Sylvain Pineau
Date: 2013-11-18 09:50:38 UTC
mfrom: <a title="Merged From 39.1.3" href="/~zyga/checkbox/packaging-trunk/revision/39.1.3">(39.1.3 launchpad/providers_new_packaging)
Revision ID: tarmac-20131118095038-v2mjn71fjgdc9i8p

"automatic merge by tarmac [r=zkrynicki][bug=][author=sylvain-pineau]"

added added

removed removed

usr/lib/plainbox-providers-1/certification/whitelists/server-cert.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/

usr/lib/plainbox-providers-1/certification/whitelists/server-selftest.whitelist usr/lib/plainbox-providers-1/certification-server/whitelists/

usr/share/plainbox-providers-1/certification-server.provider /usr/share/plainbox-providers-1

usr/lib/plainbox-providers-1/certification-server

usr/share/plainbox-providers-1/certification-server.provider