[apparmor] [Merge] lp:~cameronnemo/apparmor/dnsmasq-lxc into lp:apparmor

[Cameron Norman]

Yeah it seems that the first version had merge conflicts. I pushed to the repo with the overwrite flag and fixed that after I saw it. No idea what the original problem was... I just grabbed a new branch.
-- 
https://code.launchpad.net/~cameronnemo/apparmor/dnsmasq-lxc/+merge/254523
Your team AppArmor Developers is requested to review the proposed merge of lp:~cameronnemo/apparmor/dnsmasq-lxc into lp:apparmor.