-
Committer:
Daniel Manrique
-
Author(s):
Jeff Lane
-
Date:
2015-05-29 14:40:33 UTC
-
mfrom:
(47.2.1 p-p-p-p-c-c-fix-conf)
-
Revision ID:
daniel_manrique-20150529144033-jc47qzy15a2p6h3e
"automatic merge of lp:~bladernr/checkbox/p-p-p-p-c-c-fix-conf-file/ by tarmac [r=roadmr][bug=][author=bladernr]"