gnucash master: Multiple changes pushed

[Mike Alexander]

Updated	 via  https://github.com/Gnucash/gnucash/commit/afe76922 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/15e9bde7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dcbeba9e (commit)
	from  https://github.com/Gnucash/gnucash/commit/93e58f30 (commit)



commit afe76922938bd861ed103a9ff6d54de2282c39ff
Merge: 93e58f3 15e9bde
Author: Mike Alexander <mta at umich.edu>
Date:   Tue May 13 22:46:40 2014 -0400

    Merge branch 'maint'

commit 15e9bde7c3c190cb5385982343c3c545ab513baf
Author: Mike Alexander <mta at umich.edu>
Date:   Tue May 13 18:04:32 2014 -0400

    The cash flow report should ignore splits in trading accounts.

commit dcbeba9ec369a1d2f4b7ade0a921bd559990ec44
Author: Simon Arlott <bugzilla.gnome.simon at arlott.org>
Date:   Tue May 13 17:12:01 2014 +0200

    Bug 699687 - Add a configuration option to not display "since last run" window when opening a file



Summary of changes:
 src/gnome/dialog-sx-editor.c                       | 15 +++++-
 src/gnome/dialog-sx-since-last-run.c               | 12 ++---
 src/gnome/dialog-sx-since-last-run.h               |  4 ++
 .../org.gnucash.dialogs.sxs.gschema.xml.in.in      |  9 +++-
 src/gnome/gtkbuilder/dialog-sx.glade               | 62 +++++++++++++++-------
 src/report/standard-reports/cash-flow.scm          |  5 +-
 6 files changed, 78 insertions(+), 29 deletions(-)