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

[Matthias Clasen]

commit ce5482a46ac23a4c7eee3dd2a37f1da8ee272a1b
Merge: d912604 0bf9e7c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Aug 23 13:07:47 2010 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/devhelp

 devhelp.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc devhelp.spec
index 8eedd5e,7afd8f5..d9db080
--- a/devhelp.spec
+++ b/devhelp.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name: devhelp
  Version: 2.90.5
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2+
  Group: Development/Tools
  Summary: API documention browser
@@@ -143,9 -140,9 +143,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_libdir}/pkgconfig/*
  
  %changelog
- * Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.90.5-3
++* Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.90.5-4
 +- Incorporate a few upstream fixes
 +
+ * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 2.90.5-3
+ - recompiling .py files against Python 2.7 (rhbz#623286)
+ 
  * Wed Jul 14 2010 Matthias Clasen <mclasen at redhat.com> - 2.90.5-2
  - Fix platform check to work with GTK3