diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-01-21 04:16:31 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-01-21 04:16:31 +0000 |
| commit | 50fa41ab8b2de8c65b6cb7fe1a68d9658dfd95bc (patch) | |
| tree | c996018b5926dc0152cabc08f4af82101b0777ee /apps | |
| parent | 822f5f5ff1826af11175e5dd026ec35eba443a07 (diff) | |
Re-add merge properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
0 files changed, 0 insertions, 0 deletions