Remove automerge properties
authorDavid M. Lee <dlee@digium.com>
Fri, 20 Dec 2013 22:03:43 +0000 (22:03 +0000)
committerDavid M. Lee <dlee@digium.com>
Fri, 20 Dec 2013 22:03:43 +0000 (22:03 +0000)
commitbd0ef2508021b0040a6439cc9e3e3335b40741aa
tree0665c20e48161773916473a951bac27315d26d2b
parentb172d369c4057cddad18c0d6b1100233c07ebbd7
Remove automerge properties
........

Merged revisions 404488 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404511 65c4cc65-6c06-0410-ace0-fbb531ad65f3