[apparmor] [Merge] lp:~intrigeri/apparmor/usrmerge into lp:apparmor

[intrigeri]

intrigeri has proposed merging lp:~intrigeri/apparmor/usrmerge into lp:apparmor.

Requested reviews:
  AppArmor Developers (apparmor-dev)

For more details, see:
https://code.launchpad.net/~intrigeri/apparmor/usrmerge/+merge/312409

FWIW, the resulting policy sitll compiles (using apparmor_parser --add --abort-on-error --skip-cache --skip-kernel-load -I apparmor/profiles/extras -I apparmor.d). I didn't try loading it into the kernel though. If that's not enough testing in your opinion, please let me know.
-- 
Your team AppArmor Developers is requested to review the proposed merge of lp:~intrigeri/apparmor/usrmerge into lp:apparmor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 24508 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20161203/6c41594a/attachment-0001.diff>