Merge "Git Conversion: Switch Non-C files to ASTERISK_REGISTER_FILE."
authorMark Michelson <mmichelson@digium.com>
Wed, 29 Apr 2015 17:28:24 +0000 (12:28 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 29 Apr 2015 17:28:24 +0000 (12:28 -0500)

Trivial merge