[asterisk-commits] dlee: trunk r403402 - /trunk/

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Dec  5 16:08:30 2013
New Revision: 403402

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403402
Log:
Multiple revisions 403304,403310

........
  r403304 | dlee | 2013-12-02 12:34:50 -0600 (Mon, 02 Dec 2013) | 1 line
  
  Fixed the filename for the ari.conf docs
........
  r403310 | file | 2013-12-03 10:32:12 -0600 (Tue, 03 Dec 2013) | 5 lines
  
  Revert revision 403304: Fixed the filename for the ari.conf docs
  
  The changed value refers to the name of the module. The name of the
  configuration file is specified in the configFile section.
........

Merged revisions 403304,403310 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Dec  5 16:08:30 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403311-403312,403324,403329,403349,403364,403377
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403312,403324,403329,403349,403364,403377