From 8c3b94476449b81dae25871cbc72862883f71e58 Mon Sep 17 00:00:00 2001
From: "David M. Lee" <dlee@digium.com>
Date: Thu, 5 Dec 2013 22:08:30 +0000
Subject: [PATCH] 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


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