diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-07-21 16:05:33 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-07-21 16:05:33 +0000 |
| commit | e6e0fb0d9ae1988052c7e80baa694313163a19ce (patch) | |
| tree | cf8788fc36b10542f280737bcda769ceb22504f4 | |
| parent | 3a4520214a9f5c53b6d809aa9d2a38eb740a1b5a (diff) | |
Fix merge properties to reflect Asterisk 10 branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
0 files changed, 0 insertions, 0 deletions