Christian Boltz 7f074b6677 Merge branch 'master' into 'master' ... abstractions/gnupg: allow pubring.kbx See merge request apparmor/apparmor!58 Acked-by: Christian Boltz <apparmor@cboltz.de> for 2.9..trunk (cherry picked from commit e1929298ac) 8fc3dcb3 abstractions/gnupg: allow pubring.kbx		2018-01-20 22:59:55 +00:00
..
apparmor/profiles/extras	Merge branch 'cboltz-netstat' into 'master'	2017-12-22 21:07:59 +00:00
apparmor.d	Merge branch 'master' into 'master'	2018-01-20 22:59:55 +00:00
Makefile	build: make documentation at tarball creation time, not during build	2016-12-10 10:25:31 -08:00