Merge "Update version number in features.conf.sample"
authorMark Michelson <mmichelson@digium.com>
Mon, 18 Jan 2016 23:31:40 +0000 (17:31 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 18 Jan 2016 23:31:40 +0000 (17:31 -0600)

Trivial merge