[pkg-apparmor] [apparmor-profiles-extra] 09/09: Merge remote-tracking branch 'origin/master'

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository apparmor-profiles-extra.

commit 82d891f302aa8f8a3e51f3d33224067eb3b51322
Merge: be40dfd e3df409
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Oct 14 23:27:54 2014 +0000

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/control

 debian/control | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --cc debian/control
index 764d8bb,5540881..4d5afe6
--- a/debian/control
+++ b/debian/control
@@@ -1,14 -1,16 +1,16 @@@
  Source: apparmor-profiles-extra
- Section: admin
- Priority: extra
  Maintainer: Debian AppArmor Team <pkg-apparmor-team at lists.alioth.debian.org>
  Uploaders: intrigeri <intrigeri at debian.org>,
-  Holger Levsen <holger at debian.org>
- Build-Depends: debhelper (>= 9), dh-apparmor, apparmor
+            Holger Levsen <holger at debian.org>
+ Section: admin
+ Priority: extra
+ Build-Depends: debhelper (>= 9),
+                dh-apparmor,
+                apparmor
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
- Homepage: https://wiki.debian.org/AppArmor
+ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/apparmor-profiles-extra.git
  Vcs-Git: git://anonscm.debian.org/collab-maint/apparmor-profiles-extra.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/apparmor-profiles-extra.git
+ Homepage: https://wiki.debian.org/AppArmor
  
  Package: apparmor-profiles-extra
  Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/apparmor-profiles-extra.git