[svn-commits] jrose: trunk r405588 - /trunk/

[SVN commits to the Digium repositories]

Author: jrose
Date: Wed Jan 15 10:49:17 2014
New Revision: 405588

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405588
Log:
Blocked revisions 405587

........
Remove subversion conflict tag accidentally left in CHANGES

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-blocked (original)
+++ branch-12-blocked Wed Jan 15 10:49:17 2014
@@ -1,1 +1,1 @@
-/branches/12:398559,398578,399306,401391,403291,403779-403780,405350
+/branches/12:398559,398578,399306,401391,403291,403779-403780,405350,405587