Merge remote-tracking branch 'upstream/master'

author marshmellow42 <marshmellowrf@gmail.com>

Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)

committer marshmellow42 <marshmellowrf@gmail.com>

Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)
author marshmellow42 <marshmellowrf@gmail.com>
Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)
committer marshmellow42 <marshmellowrf@gmail.com>
Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)
diff --cc armsrc/appmain.c
Simple merge
diff --cc client/cmdlf.c
Simple merge
author	marshmellow42 <marshmellowrf@gmail.com>
	Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)
committer	marshmellow42 <marshmellowrf@gmail.com>
	Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)
		1	2
armsrc/appmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmdlf.c	patch \|	diff1 \|	diff2 \|	blob \| history