commit 48ab4f7161b99e2fe764763afed4fe038bf615fa Merge: 6d5ad61 cf4d5da Author: Bill Nottingham <notting at redhat.com> Date: Wed Jul 6 15:04:32 2011 -0400 Merge branch 'f15' into el6 .gitignore | 2 +- gnucash.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) ---