qwell: trunk r1295 - in /trunk: ./ security.txt

[SVN commits to the Asterisk-GUI project]

Author: qwell
Date: Thu Aug  2 12:16:58 2007
New Revision: 1295

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1295
Log:
Merged revisions 1293 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1293 | qwell | 2007-08-02 12:15:41 -0500 (Thu, 02 Aug 2007) | 1 line

Trivial change to test merging
........

Modified:
    trunk/   (props changed)
    trunk/security.txt

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug  2 12:16:58 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291
+/branches/1.4:1-1291,1293

Modified: trunk/security.txt
URL: http://svn.digium.com/view/asterisk-gui/trunk/security.txt?view=diff&rev=1295&r1=1294&r2=1295
==============================================================================
--- trunk/security.txt (original)
+++ trunk/security.txt Thu Aug  2 12:16:58 2007
@@ -4,4 +4,4 @@
 The login to the system must be a valid user in manager.conf who has
 config permission in read/write. Please note that the Asterisk-GUI framework 
 does not support subpermissions at this time, meaning that a user with config
-permission may change ANY configuration file in ANY way  
+permission may change ANY configuration file in ANY way.