aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-21 16:05:33 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-21 16:05:33 +0000
commit1e1f6e6192952f9ef5822a6c770901fa4e70c6d7 (patch)
treecf8788fc36b10542f280737bcda769ceb22504f4
parent6c19532b0455b3beebacc9147b23bd22ba6b2f28 (diff)
Fix merge properties to reflect Asterisk 10 branch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329105 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions