Merge ".gitignore updates for master/13"
authorMatt Jordan <mjordan@digium.com>
Tue, 14 Apr 2015 17:25:56 +0000 (12:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 14 Apr 2015 17:25:56 +0000 (12:25 -0500)

Trivial merge