Merge "Fix error's produced by astmm.h when standard allocators are used."
authorJoshua Colp <jcolp@digium.com>
Mon, 11 May 2015 10:34:05 +0000 (05:34 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 11 May 2015 10:34:06 +0000 (05:34 -0500)

Trivial merge