kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 04:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,497 Commits 150 Branches 1,597 Tags
e977b7936b02bcd33a35bf7c4e5b51f496f727e5
Commit Graph

242 Commits

Author SHA1 Message Date
Gavin Henry
8fd3f6882e New objectclass AsteriskVoiceMail and AstAccountCallLimit attribute 
Added new ObjectClass AsteriskVoiceMail, and AstAccountCallLimit attribute 
and cleaned up formatting and tested with OpenLDAP

(closes issue #15155)
Reported by: scramatte
Patches:
      asterisk.schema uploaded by scramatte (license 796)
Tested by: suretec

Review: [full review board URL with trailing slash]



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-05-28 11:18:09 +00:00
Gavin Henry
a5fc03b683 closes issue #15156 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-05-28 10:43:51 +00:00
Joshua Colp
02401da266 Merged revisions 196657 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r196657 | file | 2009-05-26 10:06:09 -0300 (Tue, 26 May 2009) | 7 lines
  
  Remove some bash specific stuff from safe_asterisk.
  
  (closes issue #10812)
  Reported by: paravoid
  Patches:
        safe_asterisk_bashism.diff uploaded by tzafrir (license 46)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@196658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-05-26 13:06:50 +00:00
Michiel van Baak
ba6dab1a1b Merged revisions 189849 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r189849 | mvanbaak | 2009-04-22 16:29:28 +0200 (Wed, 22 Apr 2009) | 12 lines
  
  replace sed with tr to remove \r from downloaded file
  
  On some systems, sed does not recognize \r in the pattern the way it
  was used here.
  Use tr instead because this works the same across systems.
  
  (closes issue #14936)
  Reported by: leobrown
  Patches: 
        2009042201_14936.diff.txt uploaded by mvanbaak (license 7)
  	  Tested by: leobrown, mvanbaak
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@189850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-04-22 14:30:47 +00:00
Tilghman Lesher
92b20aa053 Merged revisions 187763 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r187763 | tilghman | 2009-04-10 12:28:46 -0500 (Fri, 10 Apr 2009) | 2 lines
  
  Add lastms column to the contributed table designs
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-04-10 17:29:34 +00:00
Michiel van Baak
5b497da128 set ASTVARRUNDIR=$(localstatedir)/run/asterisk as default path 
When running asterisk as non-root and without this patch the pidfile wants
to go into /var/run/asterisk.pid. This directory is not writable for
the non-root user and changing permissions is not an option.
Putting it in /var/run/asterisk/asterisk.pid makes it possible
to set permissions on the /var/run/asterisk dir so everything
works as it should be.

Patched committed is based on pabelanger's patch.

(closes issue #13153)
Reported by: pabelanger
Patches:
      2009012900_bug13153-nonrootscripts.diff.txt uploaded by mvanbaak (license 7)

Review: http://reviewboard.digium.com/r/139/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-02-21 13:13:35 +00:00
Leif Madsen
898fd64528 The realtime_pgsql.sql script is missing a couple of fields. 
closes issue #14339)
Reported by: fiddur
Patches:
      realtime_pgsql.sql.diff uploaded by fiddur (license 678)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@172271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-01-29 13:47:27 +00:00
Sean Bright
c7f3a38ea3 Merged revisions 168614 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r168614 | seanbright | 2009-01-14 15:52:00 -0500 (Wed, 14 Jan 2009) | 9 lines
  
  Update autosupport script to supply info for both Zaptel and DAHDI in 1.4 and
  be sure to run dahdi_test in 1.6.x and trunk instead of zttest.
  
  (closes issue #14132)
  Reported by: dsedivec
  Patches:
        asterisk-1.4-autosupport.patch uploaded by dsedivec (license 638)
        asterisk-trunk-autosupport.patch uploaded by dsedivec (license 638)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-01-14 20:58:26 +00:00
Michiel van Baak
84a4f83020 Add a script to find out the correct settings for Asterisk behind NAT 
(closes issue #13065)
Reported by: tzafrir
Patches:
      sip_nat_settings uploaded by tzafrir (license 46)
      sip_nat_settings_6 uploaded by mvanbaak (license 7)
Tested by: tzafrir, pabelanger, Dovid and moi


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-01-09 23:04:46 +00:00
Leif Madsen
d92e53a6f5 Oops... fix the fieldname I changed yesterday to be right. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@167662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-01-08 14:27:53 +00:00
Leif Madsen
82af1445e7 Update the sip-friends.sql file to use the non-deprecated 'defaultname' instead of 'username' and remove an extra comma that would cause the script to fail as-is 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@167373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-01-07 14:26:19 +00:00
Tilghman Lesher
326653d5e8 Set up umask as a possible configuration option. 
(closes issue #13753)
 Reported by: irroot


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@164798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-12-16 19:54:11 +00:00
Joshua Colp
5d67d461aa Update autosupport script with a few changes. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@161830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-12-08 20:53:50 +00:00
Tilghman Lesher
154f9deed2 Clarify documentation, following merge of realtime_update2 branch 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@151762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-10-23 15:54:19 +00:00
Tilghman Lesher
e98ee36c0f Add a contributed script for running Asterisk without installing it, first. 
(closes issue #11680)
 Reported by: tzafrir
 Patches: 
       live_ast_6 uploaded by tzafrir (license 46)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@151601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-10-22 20:05:15 +00:00
Michiel van Baak
5797763dcf use pkill instead of killall to be more portable 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-10-07 18:00:48 +00:00
Leif Madsen
803b6799de Merged revisions 145479 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r145479 | lmadsen | 2008-10-01 13:18:30 -0400 (Wed, 01 Oct 2008) | 6 lines
  
  Update the realtime_pgsql.sql script to create the setinterfacevar column.
  
  (closes issue #13549)
  Reported by: fiddur
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@145487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-10-01 17:26:20 +00:00
Sean Bright
13c3bfcbc8 Merged revisions 143736 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r143736 | seanbright | 2008-09-19 20:50:10 -0400 (Fri, 19 Sep 2008) | 9 lines

Make vmail.cgi work with mailboxes defined in users.conf, too.

(closes issue #13187)
Reported by: netvoice
Patches:
      20080911__bug13187.diff.txt uploaded by Corydon76 (license 14)
      (Slightly modified to take alchamist's comments on mantis into account)
Tested by: msales, alchamist, seanbright

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143737 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-09-20 00:52:20 +00:00
Michiel van Baak
d1df7bfcfc Make safe_asterisk work on dash/sh/bash etc. 
(closes issue #13111)
Reported by: pabelanger
Patches:
      2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7)
Tested by: mvanbaak, pabelanger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-08-01 12:17:33 +00:00
Kevin P. Fleming
6291cd19bf remove remaining Zaptel references in various places 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-28 16:42:00 +00:00
Tilghman Lesher
865a126751 Update version 
(closes issue #13163)
 Reported by: suretec
 Patches: 
       asterisk.ldif uploaded by suretec (license 70)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133902 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-25 21:59:39 +00:00
Tilghman Lesher
46db155e92 Build the logrotate script according to paths 
(Closes issue #13147)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-24 05:21:00 +00:00
Tilghman Lesher
70a0b7fcd1 Add logrotate script for Asterisk 
(closes issue #13085)
 Reported by: pabelanger
 Patches: 
       logrotate uploaded by pabelanger (license 224)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-23 17:14:56 +00:00
Tilghman Lesher
509fd1aff7 LDAP schema updates 
(closes issue #12860)
 Reported by: flyn
 Patches: 
       asterisk.ldif uploaded by suretec (license 70)
       asterisk.schema uploaded by suretec (license 70)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-05 15:17:51 +00:00
Tilghman Lesher
ed553a7c77 Separate multiple items encoded into a single field with ';' 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-27 20:38:59 +00:00
Tilghman Lesher
115ff1bb37 Don't hang if the command is blank 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125583 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-26 22:49:16 +00:00
Jeff Peeler
ef3b214728 Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@122234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-12 17:27:55 +00:00
Tilghman Lesher
99c2f1c9f7 Expand CDR uniqueid field to 150 chars, to account for maximum systemname. 
(Closes issue #12831)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-11 17:44:39 +00:00
Sean Bright
14b35dfb38 Merged revisions 121596 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r121596 | seanbright | 2008-06-10 14:34:45 -0400 (Tue, 10 Jun 2008) | 6 lines

Fixes a problem with some buggy versions of GNU awk (3.1.3) not liking carriage returns in scripts.

(closes issue #12749)
Reported by: alinux
Tested by: Laureano (on #asterisk-dev), juggie

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-10 18:35:37 +00:00
Tilghman Lesher
9471b87d27 Merge the adaptive realtime branch, which will make adding new required fields 
to realtime less painful in the future.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-05 19:07:27 +00:00
Michiel van Baak
fcc15d65b1 Merged revisions 119301 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119301 | mvanbaak | 2008-05-30 18:44:39 +0200 (Fri, 30 May 2008) | 14 lines

dont use a bashism way to check the $VERSION variable.
The rc/init.d scripts, and safe_asterisk work on normal sh now again.
Tested on:
OpenBSD 4.2 (me)
Debian etch (me)
Ubuntu Hardy (me and loloski)
FC9 (loloski)

(closes issue #12687)
Reported by: loloski
Patches:
      20080529-12687-safe_asterisk-fixversion.diff.txt uploaded by mvanbaak (license 7)
	  Tested by: loloski, mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@119302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-30 16:47:24 +00:00
Tilghman Lesher
8722b3b5ae Add a script which installs every package needed for a Debian install of 
Asterisk, and includes possible support (to be contributed) for various other
distributions.
(closes issue #10523)
 Reported by: tzafrir
 Patches: 
       install_prereq_2 uploaded by tzafrir (license 46)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-12 20:34:38 +00:00
Russell Bryant
44bf50567f Merged revisions 115557 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115557 | russell | 2008-05-08 10:37:49 -0500 (Thu, 08 May 2008) | 3 lines

remove postgres_cdr.sql, as the CDR schema is in realtime_pgsql.sql, as well
(closes issue #9676)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-08 15:38:27 +00:00
Tilghman Lesher
7bab9e3710 Update typos in description fields 
(closes issue #12598)
 Reported by: suretec
 Patches: 
       asterisk_schema_changes.patch uploaded by suretec (license 70)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-07 13:49:15 +00:00
Jason Parker
a41572affc Merged revisions 115422 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r115422 | qwell | 2008-05-06 14:55:29 -0500 (Tue, 06 May 2008) | 15 lines

Merged revisions 115421 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r115421 | qwell | 2008-05-06 14:54:57 -0500 (Tue, 06 May 2008) | 7 lines

read requires an argument on some non-bash shells

(closes issue #12593)
Reported by: bkruse
Patches:
      getilbc.sh_12593_v1.diff uploaded by bkruse (license 132)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-06 19:55:45 +00:00
Tilghman Lesher
e01ada1ca7 Merged revisions 115285 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115285 | tilghman | 2008-05-04 22:22:25 -0500 (Sun, 04 May 2008) | 7 lines

When starting Asterisk, bug out if Asterisk is already running.
(closes issue #12525)
 Reported by: explidous
 Patches: 
       20080428__bug12525.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-05 03:25:35 +00:00
Kevin P. Fleming
17924115db Merged revisions 114823 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r114823 | kpfleming | 2008-04-29 07:53:12 -0500 (Tue, 29 Apr 2008) | 10 lines

Merged revisions 114822 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r114822 | kpfleming | 2008-04-29 07:52:32 -0500 (Tue, 29 Apr 2008) | 2 lines

stop script from appending source code if run multiple times

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-29 12:54:31 +00:00
Tilghman Lesher
3376c2212c Merged revisions 114689 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114689 | tilghman | 2008-04-26 08:15:21 -0500 (Sat, 26 Apr 2008) | 6 lines

Clicking forward without selecting a message leaves an errant .lock file.
(closes issue #12528)
 Reported by: pukepail
 Patches: 
       patch.diff uploaded by pukepail (license 431)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-26 13:17:19 +00:00
Jason Parker
c2d0b572bf Merged revisions 114138 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114138 | qwell | 2008-04-15 12:17:18 -0500 (Tue, 15 Apr 2008) | 7 lines

Update Digium autosupport script, for more useful information.

(closes issue #12452)
Reported by: angler
Patches:
      autosupport.diff uploaded by angler (license 106)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114139 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-15 17:17:37 +00:00
Tilghman Lesher
e7daf63fd8 Make tab-completion work for all cases 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-14 16:32:59 +00:00
Tilghman Lesher
c716e8de53 Add tab command-line completion 
(Closes issue #12428)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-14 02:55:41 +00:00
Tilghman Lesher
954fea4d10 The hydra grows yet another head... 
(closes issue #12401)
 Reported by: davevg
 Patches: 
       astcli.diff2 uploaded by davevg (license 209)
 Tested by: davevg, Corydon76


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-10 19:04:29 +00:00
Jason Parker
e735c70ce1 Fix a small file handle "leak" pointed out by jjshoe on #asterisk. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-09 17:56:07 +00:00
Tilghman Lesher
03479bd418 Additional enhancements 
(closes issue #12390)
 Reported by: tzafrir
 Patches: 
       astcli_fixes.diff uploaded by tzafrir (license 46)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-09 13:23:44 +00:00
Tilghman Lesher
8e5dafab4d Add commandline tool for doing CLI commands through AMI (instead of using asterisk -rx) 
(closes issue #12389)
 Reported by: davevg
 Patches: 
       astcli uploaded by davevg (license 209)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-08 21:33:11 +00:00
Tilghman Lesher
d2daba25f7 Merged revisions 113399 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113399 | tilghman | 2008-04-08 11:51:28 -0500 (Tue, 08 Apr 2008) | 6 lines

Add security note on astgenkey's manpage.
(closes issue #12373)
 Reported by: lmamane
 Patches: 
       20080406__bug12373.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-08 16:54:21 +00:00
Joshua Colp
352ca6584b Merged revisions 111129 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r111129 | file | 2008-03-26 16:55:08 -0300 (Wed, 26 Mar 2008) | 6 lines

Update autosupport script.
(closes issue #12310)
Reported by: angler
Patches:
      autosupport.diff uploaded by angler (license 106)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-26 19:56:40 +00:00
Kevin P. Fleming
13d8451459 Merged revisions 111024 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r111024 | kpfleming | 2008-03-26 14:06:56 -0500 (Wed, 26 Mar 2008) | 10 lines

Merged revisions 111019 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r111019 | kpfleming | 2008-03-26 13:58:37 -0500 (Wed, 26 Mar 2008) | 2 lines

add a script to make getting the iLBC source code simple for end users

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111025 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-26 19:08:00 +00:00
Tilghman Lesher
b8fe71d8cb Comment debug 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-18 19:53:02 +00:00
Tilghman Lesher
f0096c713e Merged revisions 107877 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107877 | tilghman | 2008-03-11 20:52:40 -0500 (Tue, 11 Mar 2008) | 2 lines

Document all of the possible realtime fields

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-12 01:54:00 +00:00