Merge branch 'master' of git+ssh://github.com/perltidy/perltidy

author Steve Hancock <perltidy@users.sourceforge.net>

Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)

committer Steve Hancock <perltidy@users.sourceforge.net>

Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)
author Steve Hancock <perltidy@users.sourceforge.net>
Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)
committer Steve Hancock <perltidy@users.sourceforge.net>
Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)
diff --cc bin/perltidy
Simple merge
diff --cc docs/perltidy.html
Simple merge
author	Steve Hancock <perltidy@users.sourceforge.net>
	Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)
committer	Steve Hancock <perltidy@users.sourceforge.net>
	Mon, 17 Dec 2018 17:31:51 +0000 (09:31 -0800)
		1	2
bin/perltidy	patch \|	diff1 \|	diff2 \|	blob \| history
docs/perltidy.html	patch \|	diff1 \|	diff2 \|	blob \| history