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

[Jan Šafránek]

commit b9c96eb0e5600e5078fed51367cf391a35d3fa40
Merge: 615e803 9876c03
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Aug 10 09:53:52 2012 +0200

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

 ipmitool.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ipmitool.spec
index 4f198ba,ad04228..3f5508b
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@@ -103,9 -103,9 +103,12 @@@ f
  
  
  %changelog
 +* Fri Aug 10 2012 Jan Safranek <jsafrane at redhat.com> - 1.8.12-1
 +- update to ipmitool-1.8.12
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.11-12
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue May 22 2012 Jan Safranek <jsafrane at redhat.com> - 1.8.11-11
  - start ipmievd.service after ipmi (#819234)