gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ee40d5dc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/826ebf2d (commit)
	from  https://github.com/Gnucash/gnucash/commit/ec768b16 (commit)



commit ee40d5dce7d49b73218a3e0428dea78e6b6fcd17
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed Mar 30 15:09:57 2016 +0200

    Fix counter format resetting in a private kvp compatible way

commit 826ebf2d2b3bc2d95c4b5dae0e37792924eb8c62
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed Mar 30 11:09:05 2016 +0200

    Fix critical warning introduced in f5a7aeca7913
    
    Critical warning happens only on master branch



Summary of changes:
 src/app-utils/business-options.scm           | 8 ++++----
 src/business/business-gnome/dialog-payment.c | 7 ++++---
 src/engine/engine.i                          | 3 +++
 src/libqof/qof/qofbook.cpp                   | 5 ++++-
 4 files changed, 15 insertions(+), 8 deletions(-)