gnucash master: Multiple changes pushed

[Frank H. Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/daf66df6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/10b3ac44 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b6337085 (commit)



commit daf66df6c7fc97ff87e594a06e05bf9683e5fe21
Merge: b633708 10b3ac4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Mar 31 10:05:22 2015 +0200

    Merge branch 'maint'

commit 10b3ac4489eba72c68bbb6f71f24aa08810c33a1
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Mar 31 07:12:24 2015 +0200

    Build system: Rename SCM_TYPE to VCS_TYPE
    
    Follow up of the 2 previous commits.



Summary of changes:
 Makefile.am  |  4 ++--
 configure.ac | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)