11196 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Luigi Rizzo	80243d0f0c	forgot to add AST_LIBS += $(BKTR_LIB) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51301 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:51:31 +00:00
Luigi Rizzo	5b9114fa73	include "asterisk/zapata.h" to get the zaptel headers. ... this should be the last one left around... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51299 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:40:25 +00:00
Luigi Rizzo	0a8d59d88a	whoops, fix a cut&paste error... ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51298 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:35:37 +00:00
Luigi Rizzo	03fc21712a	slight change to the initialization of a structure, ... also using '\0' to make it clear we need a (char)0 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51297 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:32:05 +00:00
Russell Bryant	606ee0dab4	Break out of the config processing loop for manager.conf once the correct user ... has been found so that 'cat' is non-NULL. This way, users.conf is only checked when necessary. (issue #8852, akohlsmith, committed patch a bit different) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51296 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:30:00 +00:00
Luigi Rizzo	3fefb9d516	include "asterisk/zapata.h" to get the zaptel headers. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51295 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:28:24 +00:00
Luigi Rizzo	b005ea3eee	include "asterisk/zapata.h" to get the zaptel headers ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51294 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:24:11 +00:00
Luigi Rizzo	1b35a441d9	include "asterisk/zapata.h" instead of testing for ... the location of the header files. On passing, add a cast to insure -Werror clean compilation on FreeBSD 6.x, where time_t does not match %ld git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51293 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:21:24 +00:00
Luigi Rizzo	dc31eaa025	include "asterisk/zapata.h" instead of looking ... directly for the zaptel.h and tonezone.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51292 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 16:16:19 +00:00
Luigi Rizzo	243d426ce0	another freebsd-specific check for zaptel compatibility ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51291 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 15:59:05 +00:00
Luigi Rizzo	1b10b866b8	Add a stub file to find the zaptel headers in the right ... place, rather than repeating the check on every single file. Changes to the individual files are coming. The header file name has been suggested by kevin. Approved by: kpfleming git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51290 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 15:48:13 +00:00
Luigi Rizzo	8ee383e9b9	forgot to add BKTR_INCLUDE and BKTR_LIB in makeopts.in ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51289 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 15:32:17 +00:00
Luigi Rizzo	68a84d56e3	add comments that AC_USE_SYSTEM_EXTENSIONS and AST_PROG_LD ... do not work on FreeBSD - presumably they depend on some auto* feature that is not installed by default. I am not sure on what is a proper fix. In my local copy i simply comment them out. The AST_PROG_LD is a long standing isse, there were attempts to fix it in the past but probably not enough has been copied to acinclude.m4, and i had forgotten about it because i commented out this call in configure.ac long ago git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51288 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 09:44:55 +00:00
Luigi Rizzo	badb8129a2	Add check for backtrace support on platforms that do not have ... it natively. Part of it leaked in in a previous commit. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51287 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 09:39:02 +00:00
Luigi Rizzo	eec01e4535	remove a useless (and harmful on some platforms) -lnsl ... from IKSEMEL_LIB. Actually i am not even sure whether -lgcrypt -lgpg-error are needed. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51286 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 09:36:27 +00:00
Luigi Rizzo	551fabf140	simplify checking for zaptel version and location ... (for linux, this is functionally equivalent to the previous method; for FreeBSD, it re-adds inspection in $PREFIX/zaptel.h). Please wait to regenerate the "configure" file as i have another few pending changes to configure.ac Not applicable to 1.4 until acinclude.m4 is also updated. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51285 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 09:32:13 +00:00
Dwayne M. Hubbard	18c23101a5	Merged revisions 51274 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51274 | dhubbard | 2007-01-18 18:17:32 -0600 (Thu, 18 Jan 2007) | 3 lines chan_zap compiles without libpri after committing 7877 patch ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51275 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 00:28:25 +00:00
Dwayne M. Hubbard	33243c6624	Merged revisions 51272 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51272 | dhubbard | 2007-01-18 17:56:49 -0600 (Thu, 18 Jan 2007) | 11 lines Merged revisions 51271 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51271 | dhubbard | 2007-01-18 17:47:10 -0600 (Thu, 18 Jan 2007) | 3 lines issue 7877: chan_zap module reload does not use default/initialized values on subsequent loads. Reset configuration variables to default values prior to parsing configuration file. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51273 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 00:06:35 +00:00
Jason Parker	5d25265403	Merged revisions 51265 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51265 | qwell | 2007-01-18 16:50:23 -0600 (Thu, 18 Jan 2007) | 4 lines Add some more checks for option_debug before ast_log(LOG_DEBUG, ...) calls. Issue 8832, patch(es) by tgrman ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51266 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 22:56:35 +00:00
Russell Bryant	fa16f36aae	Merged revisions 51262 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51262 | russell | 2007-01-18 15:54:23 -0600 (Thu, 18 Jan 2007) | 5 lines Ensure that the locations given to the Asterisk configure script for ncurses, curses, termcap, or tinfo are further passed along to the editline configure script. This fixes some cross-compilation environments. (issue #8637, reported by ovi, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51263 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 21:57:55 +00:00
Tilghman Lesher	9d74ea97c0	Merged revisions 51256 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51256 | tilghman | 2007-01-18 15:14:24 -0600 (Thu, 18 Jan 2007) | 10 lines Merged revisions 51255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51255 | tilghman | 2007-01-18 15:11:34 -0600 (Thu, 18 Jan 2007) | 2 lines If a timezone is not specified, assume localtime (instead of gmtime) (Issue #7748) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51257 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 21:15:59 +00:00
Joshua Colp	68d39c2b72	Merged revisions 51251 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51251 | file | 2007-01-18 14:17:34 -0500 (Thu, 18 Jan 2007) | 2 lines Only start timeout once we reach the end of the files to play back. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51252 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 19:19:24 +00:00
Jason Parker	7f58759deb	Fix filename completion for "module load" and "load" CLI commands. ... Issue 8846 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51249 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 19:03:25 +00:00
Russell Bryant	0e8bd82efe	Fix trunk version of manager support for users.conf. Now it actually pays ... attention to the "hasmanager" option. (Thanks to Anthony L. for pointing out that this was broken!) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51247 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 18:54:51 +00:00
Jason Parker	c27d2141b3	Blocked revisions 51245 via svnmerge ... ........ r51245 | qwell | 2007-01-18 12:42:00 -0600 (Thu, 18 Jan 2007) | 4 lines Fix an issue with file name completion in "module load" and "load". Issue 8846 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51246 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 18:50:43 +00:00
Joshua Colp	1a06a58250	Merged revisions 51243 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51243 | file | 2007-01-18 13:36:35 -0500 (Thu, 18 Jan 2007) | 2 lines Copy MOH settings when calling a peer so that if they put someone on hold or get put on hold themselves they get the right music class. (issue #8840 reported by mdu113) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51244 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 18:39:21 +00:00
Jason Parker	11dd11e5a1	Merged revisions 51241 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51241 | qwell | 2007-01-18 12:28:29 -0600 (Thu, 18 Jan 2007) | 2 lines Fix an issue with deprecated commands ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51242 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 18:36:17 +00:00
Tilghman Lesher	c97add6954	Merged revisions 51236 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51236 | tilghman | 2007-01-18 11:49:41 -0600 (Thu, 18 Jan 2007) | 10 lines Merged revisions 51235 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51235 | tilghman | 2007-01-18 11:42:17 -0600 (Thu, 18 Jan 2007) | 2 lines Document all the fields, including the indication that "uniqueid" should not be renamed. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51237 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 17:52:56 +00:00
Russell Bryant	2c5d2168c1	Merged revisions 51233 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51233 | russell | 2007-01-18 11:18:43 -0600 (Thu, 18 Jan 2007) | 3 lines Make the "hasmanager" option in users.conf actually have an effect. (issue #8740, LnxPrgr3) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51234 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 17:33:33 +00:00
Paul Cadach	ae286e1843	Update ast_append_ha() usage ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51221 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 06:59:22 +00:00
Joshua Colp	dd23f68d18	Add 's' option to Page application which checks devicestate before dialing. (issue #8673 reported by sunder) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51215 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 05:24:08 +00:00
Joshua Colp	180eb47bcb	Merged revisions 51213 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51213 | file | 2007-01-17 19:48:55 -0500 (Wed, 17 Jan 2007) | 2 lines Build the IMAP remote directory string better and properly. Fix an issue with encoding the GSM voicemail when attaching to the voicemail. (issue #8808 reported by akohlsmith) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51214 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 00:49:58 +00:00
Joshua Colp	461d49d2bd	Merged revisions 51211 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51211 | file | 2007-01-17 19:18:44 -0500 (Wed, 17 Jan 2007) | 2 lines Pass data as well for hold/unhold/vidupdate frames. (issue #8840 reported by mdu113) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51212 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-18 00:20:50 +00:00
Russell Bryant	445269f001	Merged revisions 51205 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51205 | russell | 2007-01-17 17:31:11 -0600 (Wed, 17 Jan 2007) | 5 lines Fix some instances where when loading func_odbc, a double-free could occur. Also, remove an unneeded error message. If the failure condition is actually a memory allocation failure, a log message will already be generated automatically. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51207 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 23:35:43 +00:00
Russell Bryant	45bd0c4f3f	Merged revisions 51204 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51204 | russell | 2007-01-17 16:09:52 -0600 (Wed, 17 Jan 2007) | 4 lines Instead of dividing the offset by 2 directly, make it more clear that the offset is being scaled by the size of the elements in the buffer. (Inspired by a discussing on the asterisk-dev list about this code) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51206 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 23:31:40 +00:00
Russell Bryant	c56f9184e8	Merged revisions 51198 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51198 | russell | 2007-01-17 15:18:35 -0600 (Wed, 17 Jan 2007) | 11 lines Merged revisions 51197 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51197 | russell | 2007-01-17 15:17:21 -0600 (Wed, 17 Jan 2007) | 3 lines Move the check for a failure of ast_channel_alloc() to before locking the pvt structure again. Otherwise, on a failure, this will cause a deadlock. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51199 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 21:20:22 +00:00
Tilghman Lesher	a48fdb83a5	Merged revisions 51195 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51195 | tilghman | 2007-01-17 14:56:15 -0600 (Wed, 17 Jan 2007) | 12 lines Merged revisions 51194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51194 | tilghman | 2007-01-17 14:52:21 -0600 (Wed, 17 Jan 2007) | 4 lines When ast_strip_quoted was called with a zero-length string, it would treat a NULL as if it were the quoting character (and would thus return the string in memory immediately following the passed-in string). ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51196 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 20:57:51 +00:00
Joshua Colp	c71d6c12f7	Don't hold channel lock while sleeping/waiting for audio stream to get setup. (issue #8834 reported by phsultan) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51193 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 19:43:13 +00:00
Jason Parker	ce5d9ab661	Merged revisions 51186 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51186 | qwell | 2007-01-17 11:36:53 -0600 (Wed, 17 Jan 2007) | 2 lines re-add "password" for realtime voicemail ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51189 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 17:37:56 +00:00
Joshua Colp	3e6d6e0e62	Merged revisions 51182 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51182 | file | 2007-01-17 01:36:41 -0500 (Wed, 17 Jan 2007) | 2 lines Return the correct result when directly writing out a packet so that the core doesn't then decide to handle it the regular way again. (issue #8833 reported by rcourtna) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51183 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 06:37:47 +00:00
Kevin P. Fleming	87fad338e6	Merged revisions 51176 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51176 | kpfleming | 2007-01-16 19:29:12 -0600 (Tue, 16 Jan 2007) | 2 lines a few more coding style cleanups and one bug fix (from AnthonyL) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51177 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 01:30:04 +00:00
Joshua Colp	31224a6b52	Merged revisions 51172 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51172 | file | 2007-01-16 19:46:29 -0500 (Tue, 16 Jan 2007) | 2 lines Move rescheduling of lagrq/pings into the scheduler callback. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51173 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 00:50:59 +00:00
Jason Parker	9ca780a271	Merged revisions 51170 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51170 | qwell | 2007-01-16 18:20:56 -0600 (Tue, 16 Jan 2007) | 4 lines Fix issue with dtmf continuation packets when the dtmf digit is 0... Issue 8831 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51171 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-17 00:22:20 +00:00
Jason Parker	73bc822fa8	Merged revisions 51167 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51167 | qwell | 2007-01-16 16:50:19 -0600 (Tue, 16 Jan 2007) | 6 lines Fix an issue with IMAP storage and realtime voicemail. Also update the vmdb sql script for IMAP specific options. Issue 8819, initial patches by bsmithurst (slightly modified by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51168 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 22:53:13 +00:00
Jason Parker	2ac5180e08	Merged revisions 51165 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51165 | qwell | 2007-01-16 16:07:53 -0600 (Tue, 16 Jan 2007) | 2 lines change documentation to reflect new procedure in 1.4/trunk ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51166 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 22:08:54 +00:00
Tilghman Lesher	bebc3a31f0	Merged revisions 51162 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51162 | tilghman | 2007-01-16 15:51:15 -0600 (Tue, 16 Jan 2007) | 10 lines Merged revisions 51161 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51161 | tilghman | 2007-01-16 15:50:04 -0600 (Tue, 16 Jan 2007) | 2 lines Add documentation walkthrough on getting Postgres to work with voicemail (from Issue 8513) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51163 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 21:52:10 +00:00
Tilghman Lesher	8cda34b5fc	Merged revisions 51159 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r51159 | tilghman | 2007-01-16 15:28:39 -0600 (Tue, 16 Jan 2007) | 10 lines Merged revisions 51158 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r51158 | tilghman | 2007-01-16 15:26:06 -0600 (Tue, 16 Jan 2007) | 2 lines Postgres driver doesn't like a NULL pointer when retrieving the length (Bug 8513) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51160 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 21:33:57 +00:00
Kevin P. Fleming	8bd73ec01b	remove pointless DEBUG message (watch those patch merges, people!) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51155 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 19:01:42 +00:00
Joshua Colp	10e3cba61e	Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51152 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 17:50:25 +00:00
Matt O'Gorman	7dd96f284b	Merged revisions 51150 via svnmerge from ... https://svn.digium.com/svn/asterisk/branches/1.4 ........ r51150 | mogorman | 2007-01-16 11:46:12 -0600 (Tue, 16 Jan 2007) | 2 lines minor things i missed before i get jumped on ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51151 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-16 17:47:26 +00:00