Merge "Happy new year 2016."
authorMatt Jordan <mjordan@digium.com>
Tue, 5 Jan 2016 15:39:47 +0000 (09:39 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 5 Jan 2016 15:39:47 +0000 (09:39 -0600)

Trivial merge