[gnucash/f13/master: 2/2] Merge branch 'master' into f13

[Bill Nottingham]

commit b60ac92e9143113dcf2fcfb57760cf161b3fe925
Merge: 428d9e2 c784523
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Mar 4 00:37:39 2011 -0500

    Merge branch 'master' into f13

 .gitignore            |    2 +-
 changeset_r20260.diff |   12 ------------
 gnucash.spec          |    9 ++++-----
 sources               |    2 +-
 testqof.diff          |   12 ------------
 5 files changed, 6 insertions(+), 31 deletions(-)
---