gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/cd79b1f5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6695f6c6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8c21aff5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/edd85faa (commit)



commit cd79b1f5deb6d8c8f9f21f66f523d0e283129f1a
Merge: edd85fa 6695f6c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon May 5 17:57:03 2014 +0200

    Merge branch 'maint'
    
    * Mike Alexander's Better test for conflict between optimization and FORTIFY_SOURCE
    * Fix crash with libdbi >= 0.9.0, based on a patch by Colin Law

commit 6695f6c6608869a2d4d62e94f060bf77b618d60c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon May 5 17:53:21 2014 +0200

    Fix crash with libdib >= 0.9.0
    
    Based on a patch provided by Colin Law

commit 8c21aff5e1dc878f62ef42794524ba17c5601626
Author: Mike Alexander <mta at umich.edu>
Date:   Fri May 2 18:02:08 2014 -0400

    Better test for conflict between optimization and FORTIFY_SOURCE



Summary of changes:
 src/backend/dbi/gnc-backend-dbi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)