gnucash master: Multiple changes pushed

[Frank H. Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/54d696db (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51ff4e16 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1aa941cb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8838cee7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9c4ea35d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3327d20e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ac149b7d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5370124d (commit)
	from  https://github.com/Gnucash/gnucash/commit/ab41c01d (commit)



commit 54d696db759adff8aea7a3dab74dce84bbb101a4
Merge: 9c4ea35 51ff4e1
Author: fell <f.ellenberger at online.de>
Date:   Sun Dec 27 10:43:46 2015 +0100

    Merge branch 'maint'
    
    Conflicts:
    	src/gnome/gnc-plugin-basic-commands.c

commit 51ff4e166874043591633c0880cc43d3a9ef1407
Author: fell <f.ellenberger at online.de>
Date:   Sun Dec 27 10:22:35 2015 +0100

    Add a few more eclipse specific files to gitignore

commit 1aa941cbf4e8692ae2e02a66550cdfc544039009
Author: fell <f.ellenberger at online.de>
Date:   Sun Dec 27 10:19:00 2015 +0100

    Postpone the renaming of the menu entry "_Price Editor" to the next main
    release.

commit 8838cee7cabe62c0300660f685e8070e9989c78e
Author: Grzegorz Milka <grzegorzmilka at gmail.com>
Date:   Sat Dec 26 15:34:01 2015 -0800

    Bug 759859 - Reconcilation does not convert transactions' currency to the main one making reconcilation impossible.
    
    Disable the Include subaccounts checkbox if there are descendant accounts with different commodities.

commit 9c4ea35d15adb2d497fc32fdc41e1b386ef86d3f
Author: fell <f.ellenberger at online.de>
Date:   Sat Dec 26 05:19:06 2015 +0100

    Price Editor - use different names for different windows
    
    Rename the main window to "price database"

commit 3327d20e8e8810b31f2011f337070c7f48613e57
Author: Mike Evans <mikee at saxicola.co.uk>
Date:   Sun Dec 20 13:16:54 2015 +0000

    Bug 759674 - GNUCash crashes when importing invoices or bills with delimited import
    
    Make sure all instances of gchar*  have *some* value, ie NULL, else undefined behavior occurs
    when free is called on those objects.

commit ac149b7d090deee7df1b174cdb67a22cc3822d02
Author: fell <f.ellenberger at online.de>
Date:   Sat Dec 26 05:19:06 2015 +0100

    Price Editor - use different names for different windows
    
    Rename the main window to "price database"

commit 5370124dc1368ebe19924a04b4f08e0c174c8dd7
Author: Mike Evans <mikee at saxicola.co.uk>
Date:   Sun Dec 20 13:16:54 2015 +0000

    Bug 759674 - GNUCash crashes when importing invoices or bills with delimited import
    
    Make sure all instances of gchar*  have *some* value, ie NULL, else undefined behavior occurs
    when free is called on those objects.



Summary of changes:
 .gitignore                                   |  2 ++
 src/gnome/gnc-plugin-basic-commands.c        |  3 +-
 src/gnome/gtkbuilder/dialog-price.glade      |  2 +-
 src/gnome/gtkbuilder/window-reconcile.glade  |  2 ++
 src/gnome/window-reconcile.c                 | 44 ++++++++++++++++++++++++++--
 src/plugins/bi_import/dialog-bi-import-gui.c | 14 ++++-----
 src/plugins/bi_import/dialog-bi-import.c     | 19 +++++++-----
 7 files changed, 66 insertions(+), 20 deletions(-)