summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2011-10-13 22:58:30 +0000
committerRichard Mudgett <rmudgett@digium.com>2011-10-13 22:58:30 +0000
commitec93d933c056c62a7e4c31897e2b159641d80557 (patch)
tree4f40f3a9fd1865499258cbd406b20b4b18d902ad
parent3ee015db7a45d0bee3598049b25c8a26ee57c589 (diff)
Restore branch 10 merge properties.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
0 files changed, 0 insertions, 0 deletions