gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/10de2a23 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/25a6c697 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/91e14b60 (commit)



commit 10de2a232bd6c6d6ca46da6eae5a132d7b815032
Merge: 91e14b6 25a6c69
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Oct 29 10:27:06 2015 -0700

    Merge branch 'maint'

commit 25a6c6970a3e06eff67d4570d581b41e85d3bae6
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 27 18:04:13 2015 -0700

    Bug 757174 - FTBFS: /tmp/buildd/gnucash-docs-2.6.7/mincho.xml
    
    Don't emit metrics-url for fop version 2+.



Summary of changes:
 configure.ac          | 31 ++++++++++++++++++++-----------
 guide/ja/fop.xconf.in |  4 ++--
 2 files changed, 22 insertions(+), 13 deletions(-)