[perl-Mail-SPF/el6: 8/8] Merge branch 'master' into el6
by Nick Bebout
commit acebc58bdb54a72b061c96208fcb6505880b2fa5
Merge: 68ee90b a4e70ce
Author: Nick Bebout <nb(a)fedoraproject.org>
Date: Wed Apr 3 15:19:12 2013 -0500
Merge branch 'master' into el6
Conflicts:
.gitignore
.gitignore | 3 ++-
perl-Mail-SPF.spec | 41 +++++++++++++++++++++++++++++++++--------
sources | 2 +-
3 files changed, 36 insertions(+), 10 deletions(-)
---
11 years, 1 month