From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 8 Mar 2014 01:45:33 +0000 (-0800)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/20170521-1~21
X-Git-Url: https://git.donarmstrong.com/?p=perltidy.git;a=commitdiff_plain;h=4107c18ce17515557235b1ac91ab586b46098727

Merge branch 'upstream'
---

4107c18ce17515557235b1ac91ab586b46098727