[at: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/at

[Marcela Mašláňová]

commit d7c6e9279d01a47489cfe5f416a474c0738489e8
Merge: 4c35e57 f351bad
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Mon Nov 14 10:48:00 2011 +0100

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

 at.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc at.spec
index e76450c,39edcd1..0b42d21
--- a/at.spec
+++ b/at.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary:	Job spooling tools
  Name:		at
  Version:	3.1.13
--Release:	4%{dist}
++Release:	5%{dist}
  License:	GPLv2+
  Group:		System Environment/Daemons
  URL:		http://ftp.debian.org/debian/pool/main/a/at
@@@ -188,9 -188,9 +188,12 @@@ f
  %attr(0755,root,root)		%{_initrddir}/atd
  
  %changelog
- * Mon Nov 14 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.1.13-4
++* Mon Nov 14 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.1.13-5
 +- fix incorrect option in test in 56atd
 +
+ * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.13-4
+ - Rebuilt for glibc bug#747377
+ 
  * Wed Sep  4 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.1.13-3
  - 729742 fix 56atd script for systemd