Merge remote-tracking branch 'XTUPLE/4_7_x' into 23257-qr-final

author Steve Hackbarth <stephenhackbarth@gmail.com>

Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)

committer Steve Hackbarth <stephenhackbarth@gmail.com>

Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)
author Steve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)
committer Steve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)
diff --cc package.json
Simple merge
diff --cc scripts/install_xtuple.sh
Simple merge
author	Steve Hackbarth <stephenhackbarth@gmail.com>
	Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)
committer	Steve Hackbarth <stephenhackbarth@gmail.com>
	Mon, 8 Sep 2014 20:43:21 +0000 (16:43 -0400)
		1	2
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/install_xtuple.sh	patch \|	diff1 \|	diff2 \|	blob \| history