[whatsup/f17: 7/12] Merge branch 'master' into f17

[David Brown]

commit c061690ca22fcb56ff8b35a01441b25e559cbe3a
Merge: 8be3b09 c263781
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 10:52:16 2012 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	whatsup.spec

 whatsup.spec |   65 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 12 deletions(-)
---
diff --cc whatsup.spec
index 1ec378b,ae4a6d9..a7756aa
--- a/whatsup.spec
+++ b/whatsup.spec
@@@ -220,9 -252,18 +252,18 @@@ f
  
  
  %changelog
+ * Tue Jul 24 2012 David Brown <david.brown at pnnl.gov> - 1.13-1
+ - New Upstream Release
+ 
 +* Tue Mar 13 2012 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.12-8
 +- Rebuild for new opensm
 +
+ * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 1.12-9
+ - Perl 5.16 rebuild
+ 
 -* Sat Mar 03 2012 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.12-8
 -- Rebuild for new opensm
 -
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-7
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild