Author: mjordan Date: Thu Aug 7 20:36:16 2014 New Revision: 420498 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420498 Log: Remove 12 merge properties Modified: trunk/ (props changed) Propchange: trunk/ ('branch-12-blocked' removed) Propchange: trunk/ ('branch-12-merged' removed)