Merge "main/config_options: Check for existance of internal object before derefing"
authorMatt Jordan <mjordan@digium.com>
Mon, 21 Sep 2015 13:08:36 +0000 (08:08 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 21 Sep 2015 13:08:36 +0000 (08:08 -0500)

Trivial merge