gnucash master: Multiple changes pushed

[J. Alex Aycinena]

Updated	 via  https://github.com/Gnucash/gnucash/commit/9f3dc0c8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c0086e15 (commit)
	from  https://github.com/Gnucash/gnucash/commit/58b35eb7 (commit)



commit 9f3dc0c82657d99316a0477a2a36ab5fa00c4ed9
Merge: 58b35eb c0086e1
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date:   Mon Jun 6 16:28:04 2016 -0700

    Merge maint.

commit c0086e15e957df3589918abbea9c6a3579d24933
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date:   Mon Jun 6 15:17:55 2016 -0700

    Partially revert commit B555f495 and solve problem more simply by instead resequencing prior statements.



Summary of changes:
 src/app-utils/gnc-ui-util.c       |  1 -
 src/gnome-utils/dialog-options.c  | 12 +++---------
 src/gnome-utils/dialog-options.h  |  1 -
 src/gnome-utils/gnc-main-window.c |  7 -------
 4 files changed, 3 insertions(+), 18 deletions(-)