diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-19 21:32:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-19 21:32:35 +0000 |
| commit | c3f7a9eab8203caa372b26e5219b647e10a90e56 (patch) | |
| tree | 6b0c0bf9d0548cfd085d9a8e3741f4de71fb4f79 | |
| parent | 136bf9c5f44f94cdb5f46100b67f5bde08acf39d (diff) | |
Edit the merge properties to match their names.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328880 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions