Merge "git: Ignore *.orig."
authorJoshua Colp <jcolp@digium.com>
Mon, 14 May 2018 11:56:08 +0000 (06:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 14 May 2018 11:56:08 +0000 (06:56 -0500)

Trivial merge