Merge "Astobj2: Ensure all calls to __adjust_lock pass a valid object."
authorMatt Jordan <mjordan@digium.com>
Thu, 23 Apr 2015 11:50:52 +0000 (06:50 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 23 Apr 2015 11:50:52 +0000 (06:50 -0500)

Trivial merge