aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 17:49:52 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-03 17:49:52 +0000
commit1062cd92488c24331377974d914df5744f5b5512 (patch)
treef1ac405903194cd995880e3cbb8f49af42268844
parent8671effe05be55f68c7579b450f631fc49c8c9a9 (diff)
Fix merge props
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260745 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions