summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2011-09-20 22:51:41 +0000
committerRichard Mudgett <rmudgett@digium.com>2011-09-20 22:51:41 +0000
commitbbafe3bd2ccd77a5d1b1841f0c549c07a84b8865 (patch)
tree82df38ccf425e131c4bf52f155398c159bd90a0b
parent6b715d8f5c8a5b14d8bf6e437609b5ad1330efb7 (diff)
Restore branch-10 merge properties.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
0 files changed, 0 insertions, 0 deletions