[gnucash/f17: 4/4] Merge branch 'master' into f17

[Bill Nottingham]

commit f7c08f289bf4ff485cde5a4a668e0745452af03d
Merge: 422f41f 7a06742
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jul 13 14:51:29 2012 -0400

    Merge branch 'master' into f17

 .gitignore                       |    2 +-
 gnucash-2.4.9-never-unload.patch |   19 -------------------
 gnucash-notsvn.patch             |   22 +++++++++++-----------
 gnucash.spec                     |    9 ++++-----
 sources                          |    2 +-
 5 files changed, 17 insertions(+), 37 deletions(-)
---
diff --cc gnucash.spec
index 5d5c9b2,e763459..83c2f73
--- a/gnucash.spec
+++ b/gnucash.spec
@@@ -2,12 -2,12 +2,12 @@@
  
  Name: gnucash
  Summary: Finance management application
- Version: 2.4.10
+ Version: 2.4.11
  URL: http://gnucash.org/
 -Release: 1%{?dist}
 +Release: 4%{?dist}
  License: GPLv2+
  Group: Applications/Productivity
 -Source: http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/gnucash-%{version}.tar.bz2
 +Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2
  Source2: engine-common.i
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, zlib-devel
@@@ -169,11 -165,11 +165,14 @@@ f
  %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI
  
  %changelog
+ * Fri Jul 13 2012 Bill Nottingham <notting at redhat.com> - 2.4.11-1
+ - update to 2.4.11
+ 
 -* Tue Jul 10 2012 Bill Nottingham <notting at redhat.com> - 2.4.10-2
 -- rebuild for ofx ABI bump
 +* Thu Jun 21 2012 Bill Nottingham <notting at redhat.com> - 2.4.10-4
 +- fix tips (#828573)
 +
 +* Sat Jun 16 2012 Bill Nottingham <notting at redhat.com> - 2.4.10-2
 +- Add potential fix for invoice crasher (#824189, #831882, b.g.o 677004)
  
  * Wed Feb 29 2012 Bill Nottingham <notting at redhat.com> - 2.4.10-1
  - update to 2.4.10