gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/cac89600 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7e288d04 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3ae0c780 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e2a85c41 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/778f9450 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c52ada51 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c5698228 (commit)



commit cac896005c6e6a3e82dd4b25b1f62f10d26e22fb
Merge: 7e288d0 3ae0c78
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 23 18:37:45 2014 -0800

    Merge branch 'maint'
    
    With a change to xaccTransIsSXTemplate to work with the private kvp
    change in master.

commit 7e288d04467a73fa250312f02e4889d34316f43f
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 23 18:37:27 2014 -0800

    Fix failure to load SX formulas, probably among other things.
    
    Removing KVP_TYPE_BINARY from the enum shifted the values of KVP_TYPE_GLIST
    and KVP_TYPE_FRAME, which made previously-stored values inaccessible.
    
    Insert a placeholder to restore them to their original values.

commit 3ae0c780b7280adba3b886f1e864d3b95207fc6e
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 23 09:01:18 2014 -0800

    Extract function to clarify intent.

commit e2a85c417fc3cf8d29f9a54e8a9340219af2601e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Dec 22 14:19:52 2014 -0800

    Bug 741228 - "Red line" threshold applies to Template scheduled transactions
    
    Check for a GNC_SX_ID kvp on the split to exclude SX transactions from being blocked.

commit 778f9450c4a14dc5337f27924b258b105d0ffdad
Author: Mike Alexander <mta at umich.edu>
Date:   Wed Dec 10 19:16:09 2014 -0500

    Tell Guile (and others) to look in install/lib/gnucash for libraries.
    Without this Guile can't find libgncmod-engine and GnuCash won't start.
    I don't know how this worked before, perhaps because the correct path
    was in src/bin/overrides/gnucash-env.in

commit c52ada5121ce81ab9ca2389ac72aac4d85b45d4f
Author: Francisco <fserrador at gmail.com>
Date:   Tue Dec 23 18:30:47 2014 +0100

    Update Spanish translation



Summary of changes:
 po/es.po                   | 27712 ++++++++++++++++++++++++-------------------
 src/bin/environment.in     |     5 +
 src/engine/Transaction.c   |    28 +-
 src/libqof/qof/kvp_frame.h |     1 +
 4 files changed, 15326 insertions(+), 12420 deletions(-)