Put merge tracking for r399039 back.
authorDavid M. Lee <dlee@digium.com>
Fri, 13 Sep 2013 14:34:43 +0000 (14:34 +0000)
committerDavid M. Lee <dlee@digium.com>
Fri, 13 Sep 2013 14:34:43 +0000 (14:34 +0000)
commit0ab5d3015dd36aad342153b1847824852fc42684
tree70d4a4061eb21a6d816b0903cfe611f19da63cc6
parent873969d6c53510547e6aada6accffb3641e81431
Put merge tracking for r399039 back.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399080 65c4cc65-6c06-0410-ace0-fbb531ad65f3