[salt: 2/2] merged changelog properly

[Clint Savage]

commit 03b3ec0200eff6272754d11f7bb15b5bf18a7952
Merge: 0e589e5 d5dcadd
Author: Clint Savage <herlo1 at gmail.com>
Date:   Wed Jul 25 14:03:37 2012 -0600

    merged changelog properly

 salt.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc salt.spec
index 9eb3798,5a8cb53..838dd4a
--- a/salt.spec
+++ b/salt.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name: salt
  Version: 0.10.1
--Release: 2%{?dist}
++Release: 3%{?dist}
  Summary: A parallel remote execution system
  
  Group:   System Environment/Daemons
@@@ -259,9 -261,9 +259,12 @@@ f
  %endif
  
  %changelog
- * Wed Jul 25 2012 Clint Savage <herlo1 at gmail.com> - 0.10.1-2
++* Wed Jul 25 2012 Clint Savage <herlo1 at gmail.com> - 0.10.1-3
 +- Removed dependency on PyXML
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Sat Jun 16 2012 Clint Savage <herlo1 at gmail.com> - 0.10.1-1
  - Moved to upstream release 0.10.1