gnucash master: Multiple changes pushed

[Mike Alexander]

Updated	 via  https://github.com/Gnucash/gnucash/commit/81fb7738 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f8139efa (commit)
	 via  https://github.com/Gnucash/gnucash/commit/985fecb0 (commit)
	from  https://github.com/Gnucash/gnucash/commit/cac3b5c2 (commit)



commit 81fb773856ae3dc1da17e648dd03b32e5e532519
Merge: cac3b5c f8139ef
Author: Mike Alexander <mta at umich.edu>
Date:   Sun May 25 19:10:03 2014 -0400

    Merge branch 'maint'

commit f8139efad18f3b6cea36da9209e7d225eee97d67
Author: Mike Alexander <mta at umich.edu>
Date:   Sun May 25 18:48:44 2014 -0400

    Always use the price we display to calculate the current value of an account.

commit 985fecb0321d0ad5739bece151c8f85b3147e846
Author: Michalis Kamprianis <michalis at linuxmail.org>
Date:   Sat May 10 01:04:03 2014 +0200

    Bug 719457 - Template for Home Mortgage Loan isn't properly nested.
    
    Several account templates containted accounts with two parents, resulting to incorrect nesting.
    
    	modified:   accounts/C/acctchrt_homeloan.gnucash-xea
    	modified:   accounts/C/acctchrt_otherloan.gnucash-xea
    	modified:   accounts/C/acctchrt_retiremt.gnucash-xea
    	modified:   accounts/C/acctchrt_spouseretire.gnucash-xea
    	modified:   accounts/en_GB/acctchrt_homeloan.gnucash-xea
    	modified:   accounts/en_GB/acctchrt_otherloan.gnucash-xea
    	modified:   accounts/en_GB/acctchrt_retiremt.gnucash-xea
    	modified:   accounts/en_GB/acctchrt_spouseretire.gnucash-xea



Summary of changes:
 accounts/C/acctchrt_homeloan.gnucash-xea           | 1 -
 accounts/C/acctchrt_otherloan.gnucash-xea          | 1 -
 accounts/C/acctchrt_retiremt.gnucash-xea           | 1 -
 accounts/C/acctchrt_spouseretire.gnucash-xea       | 1 -
 accounts/en_GB/acctchrt_homeloan.gnucash-xea       | 1 -
 accounts/en_GB/acctchrt_otherloan.gnucash-xea      | 1 -
 accounts/en_GB/acctchrt_retiremt.gnucash-xea       | 1 -
 accounts/en_GB/acctchrt_spouseretire.gnucash-xea   | 1 -
 src/report/standard-reports/advanced-portfolio.scm | 7 ++++---
 9 files changed, 4 insertions(+), 11 deletions(-)