[SCM] acegi-security packaging branch, master, updated. upstream/1.0.7-6-g7ee441c

[tony mancill]

The following commit has been merged in the master branch:
commit 7ee441c54ebdaca848fcc52e268de53f2af1ad63
Merge: 6e69ce173c80efbf83e543b0b4967369d73ec7bc 61e20f3fb7fc69c41a6af209a0f0708e76389666
Author: tony mancill <tmancill at debian.org>
Date:   Sun Oct 23 11:46:56 2011 -0700

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/acegi-security

diff --combined debian/copyright
index cbb238f,75c49f3..143de52
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,6 -1,6 +1,6 @@@
  Format: http://dep.debian.net/deps/dep5/
  Upstream-Name: Acegi Security
 -Upstream-Contactr:  Ben Alex <benalex at users.sourceforge.net> as Developer
 +Upstream-Contact:  Ben Alex <benalex at users.sourceforge.net> as Developer
               Colin Sampaleanu <colinml1 at exis.com> as Developer
               Carlos Sanchez <carlossg at users.sourceforge.net> as Developer
               Luke Taylor <luke_t at users.sourceforge.net> as Developer
@@@ -14,6 -14,10 +14,10 @@@ Files: 
  Copyright: 2004-2007 Acegi Technology Pty Limited
  License: Apache-2.0
  
+ Files: acegi_checkstyle.xml
+ Copyright: 2001-2004 The Apache Software Foundation.
+ License: Apache-2.0
+ 
  Files: debian/*
  Copyright: 2011, Canonical Ltd (http://www.canonical.com/)
  License: Apache-2.0

-- 
acegi-security packaging