[asterisk-commits] wdoekes: trunk r411810 - /trunk/

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Mon Apr  7 09:53:02 2014
New Revision: 411810

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

........
configs: Clean up long line and typo in res_odbc.conf.sample.
........

Merged revisions 411807 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 411808 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-blocked (original)
+++ branch-12-blocked Mon Apr  7 09:53:02 2014
@@ -1,1 +1,1 @@
-/branches/12:398559,398578,399306,401391,403291,403779-403780,405350,405587,409762,410006,411512
+/branches/12:398559,398578,399306,401391,403291,403779-403780,405350,405587,409762,410006,411512,411809