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

[Bill Nottingham]

commit a11c09bb0d984f38a3817ece15fab385aabf3b5d
Merge: f221220 79d484b
Author: Bill Nottingham <notting at redhat.com>
Date:   Thu Jan 16 15:10:54 2014 -0500

    Merge branch 'master' into el6

 .gitignore        |    2 +-
 gnucash-docs.spec |   37 ++++++++++++++++++++++++-------------
 sources           |    2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)
---