[pam_abl/el6: 12/12] Merge branch 'master' into el6

[Eric Smith]

commit 78c3bba19e7706f125f485f3c90486ae014030a2
Merge: 213a326 4b23013
Author: Eric Smith <brouhaha at fedoraproject.org>
Date:   Wed Jun 5 16:36:58 2013 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                |    2 +-
 pam_abl-0.2.3-build.patch |   77 -------
 pam_abl-0.2.3-fixes.patch |  540 ---------------------------------------------
 pam_abl.spec              |   94 ++++++---
 sources                   |    2 +-
 5 files changed, 68 insertions(+), 647 deletions(-)
---
diff --cc .gitignore
index 25a2dbc,a96580f..d7f0e86
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--pam_abl-0.2.3.tar.gz
 -/pam-abl-0.5.0.tar.gz
++pam_abl-0.5.0.tar.gz