Merge "main/asterisk.c: Update Asterisk copyright year"
authorJoshua Colp <jcolp@digium.com>
Mon, 11 May 2015 19:44:52 +0000 (14:44 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 11 May 2015 19:44:52 +0000 (14:44 -0500)

Trivial merge