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

[Sven Lankes]

commit d971c4e19c28b4d9a53058b57f05852aaf4af6d8
Merge: 273c5c2 57fef55
Author: Sven Lankes <sven at lank.es>
Date:   Sun Jul 22 15:18:50 2012 +0200

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

 rancid.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc rancid.spec
index 6f855ea,2945e29..842295f
--- a/rancid.spec
+++ b/rancid.spec
@@@ -112,9 -112,12 +112,15 @@@ exit 
  
  
  %changelog
 +* Sun Jul 22 2012 Sven Lankes <sven at lank.es> - 2.3.8-1
 +- New upstream release
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild