John Johansen 2997b7d912 Merge branch 'cboltz-netstat' into 'master' ... netstat: allow capability sys_ptrace, See merge request apparmor/apparmor!46 (cherry picked from commit a3693f56f3) 81ca52d9 netstat: allow capability sys_ptrace,		2017-12-22 21:07:59 +00:00
..
apparmor/profiles/extras	Merge branch 'cboltz-netstat' into 'master'	2017-12-22 21:07:59 +00:00
apparmor.d	Merge branch 'cboltz-xauth' into 'master'	2017-12-22 20:21:29 +00:00
Makefile	build: make documentation at tarball creation time, not during build	2016-12-10 10:25:31 -08:00