aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 17:50:26 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 17:50:26 +0000
commite1ae64d730feef93f9b11ae4a1f4ab2b33986f28 (patch)
tree3357fd2e45c2c2a4527cc1dc46b9b743944a73ed
parenta88449616aa68d2385f432d8ef4bef181a21b441 (diff)
Fix merge props
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@260746 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions