[sks: 15/15] Merge branch 'master' of ssh://pkgs.fedoraproject.org/sks

[Nick Bebout]

commit 06903fda51266342286df2cb39d65e9a7ccd754e
Merge: 97a3736 36f8469
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 17:44:59 2012 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/sks
    
    Conflicts:
    	sks.spec

 sks.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sks.spec
index d922d40,7c8aefd..4a528dc
--- a/sks.spec
+++ b/sks.spec
@@@ -99,19 -43,12 +99,22 @@@ f
  %{_bindir}/sks
  %{_bindir}/sks_build.sh
  %{_bindir}/sks_add_mail
 +%{_sbindir}/%{name}-db
 +%{_sbindir}/%{name}-recon
  %{_mandir}/man8/sks.8.gz
 +%{_initrddir}/sks-*
  
  %changelog
 +* Tue Jan 24 2012 Nick Bebout <nb at fedoraproject.org> - 1.1.3-0.1.20120124hg
 +- Upgrade to John Clizbe's latest sks from mercurial repo so we can use
 +- css, etc in the webpage
 +
 +* Thu Jan 19 2012 Nick Bebout <nb at fedoraproject.org> - 1.1.2-2
 +- Add init.d scripts
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Dec 13 2011 Nick Bebout <nb at fedoraproject.org> - 1.1.2-1
  - Upgrade to 1.1.2