[gnucash-docs/el6: 5/5] Merge branch 'master' into el6

[Bill Nottingham]

commit f221220b379767d93a72876f1ddf352616c3aedd
Merge: 6fa1e08 54c1193
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Jul 5 15:13:55 2011 -0400

    Merge branch 'master' into el6

 .gitignore        |    2 +-
 gnucash-docs.spec |   10 ++++++++--
 sources           |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---