dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

468 Commits

Author SHA1 Message Date
mogorman 0bb5fbb3a6 Patch allows for changing voicemail password in users.conf from voicemail main, written by AnthonyL bug #8436
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@51031 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-16 00:29:25 +00:00
mogorman 9fb8eb68fa Merged revisions 50957 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4

................
r50957 | mogorman | 2007-01-15 15:08:07 -0600 (Mon, 15 Jan 2007) | 12 lines

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

........
r50946 | mogorman | 2007-01-15 14:44:53 -0600 (Mon, 15 Jan 2007) | 4 lines

Solves issue with forwarding voicemails from folders other than inbox.
patch by anthonyl.


........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@50958 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-15 21:12:56 +00:00
tilghman c5664a7a2b Merged revisions 50151 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50151 | tilghman | 2007-01-09 07:40:45 -0600 (Tue, 09 Jan 2007) | 12 lines

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

........
r50150 | tilghman | 2007-01-09 07:30:04 -0600 (Tue, 09 Jan 2007) | 4 lines

The advent of realtime has enabled people to use commas in the fullname field.
This could cause an issue with sending voicemails, when the field is unquoted.
(Issue 8595)

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@50152 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-09 13:45:14 +00:00
qwell 9e33bd0ded Merged revisions 50098 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50098 | qwell | 2007-01-08 17:39:12 -0600 (Mon, 08 Jan 2007) | 4 lines

Fix an issue with voicemail and users.conf, where it wouldn't ever parse a password, since it was using "secret" instead of "password"

Issue 8761, reported by and patch suggestion from ssokol.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@50099 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-08 23:40:28 +00:00
kpfleming ec3737e835 const-ify some more APIs, and fix rev 49710 from branch-1.4 in a better way here
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49711 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-05 23:32:42 +00:00
mogorman b3ec320ba7 Merged revisions 49459 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4

................
r49459 | mogorman | 2007-01-04 12:11:19 -0600 (Thu, 04 Jan 2007) | 10 lines

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

........
r49447 | mogorman | 2007-01-04 11:45:16 -0600 (Thu, 04 Jan 2007) | 2 lines

converted a lot of 256 to PATH_MAX and some white space fixes.

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49464 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-04 18:28:50 +00:00
mogorman 7838cc5758 Merged revisions 49413 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4

................
r49413 | mogorman | 2007-01-04 10:50:56 -0600 (Thu, 04 Jan 2007) | 11 lines

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

........
r49412 | mogorman | 2007-01-04 10:48:43 -0600 (Thu, 04 Jan 2007) | 3 lines

good catch russell sorry i missed that.
fix magic number with proper sizeof

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49414 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-04 16:52:38 +00:00
mogorman 2a8633a4fb Merged revisions 49355 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4

................
r49355 | mogorman | 2007-01-03 17:32:03 -0600 (Wed, 03 Jan 2007) | 14 lines

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

........
r49354 | mogorman | 2007-01-03 17:22:47 -0600 (Wed, 03 Jan 2007) | 6 lines

When using ODBC_STORAGE VoicemailMain doesn't create the
subdirectories for a mailbox such as the INBOX directory.

this patch solves that problem, was written by anthony
be-125

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49356 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-03 23:41:19 +00:00
tilghman 3ad2a81a5d 1. Rename 'maxmessage' to 'maxsecs' to differentiate from 'maxmsg'.
2. Rename 'minmessage' to 'minsecs' for parity.
3. Make 'maxsecs' a per-user option, in addition to global.
(Issue # 8624)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49075 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-31 04:54:20 +00:00
murf 322326058e a quick fix to app_sms.c to get rid of cursed compiler warnings so I can compile under --enable-dev-mode
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48767 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-21 19:44:20 +00:00
file 6b788c5c2f Merged revisions 48637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48637 | file | 2006-12-19 21:56:09 -0500 (Tue, 19 Dec 2006) | 2 lines

vms doesn't exist on non-IMAP storage builds.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48638 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-20 02:58:13 +00:00
file c4e89a0ccd Merged revisions 48596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48596 | file | 2006-12-19 18:04:30 -0500 (Tue, 19 Dec 2006) | 2 lines

Pass 'vms' pointer to record_and_review so it is then passed to the IMAP store file function. (issue #8614 reported by punknow)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48597 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-19 23:05:57 +00:00
file 4dbebde15a Merged revisions 48401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48401 | file | 2006-12-11 23:13:48 -0500 (Mon, 11 Dec 2006) | 2 lines

Use S_OR in my previous app_voicemail. This is the way it should have been done.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48402 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-12 04:14:50 +00:00
file ab99637bde Merged revisions 48391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48391 | file | 2006-12-11 16:31:23 -0500 (Mon, 11 Dec 2006) | 2 lines

Return non-existant callerid handling to that which it was before. In 1.4 and trunk callerid can be allocated but not have any contents so we have to use ast_strlen_zero before passing it to the relevant functions. (issue #8567 reported by pabelanger)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48392 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-11 21:35:28 +00:00
russell 43115b2419 Resolve some pointer signedness compiler warnings in app_osplookup, and
constify a bunch of usage strings for CLI commands.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48307 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-06 07:39:39 +00:00
tilghman 99dfd35cae Merged revisions 48254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48254 | tilghman | 2006-12-04 19:41:02 -0600 (Mon, 04 Dec 2006) | 2 lines

Oops, forgot to release the odbc handle

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48255 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-05 01:46:14 +00:00
tilghman c0a6c60abc Merged revisions 48252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48252 | tilghman | 2006-12-04 19:34:34 -0600 (Mon, 04 Dec 2006) | 14 lines

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

........
r48251 | tilghman | 2006-12-04 19:26:08 -0600 (Mon, 04 Dec 2006) | 6 lines

If the recording in the database is too large, it will fail to retrieve with
an mmap error.  Not too sure why this doesn't happen when we put it in the
database, also, but since that doesn't seem to be broken, I'm not going to fix
it (at least until someone reports it).  Solution is to ask for the file in
smaller chunks.  (Bug 8385)

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48253 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-05 01:39:53 +00:00
qwell eac9745170 Merged revisions 48248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48248 | qwell | 2006-12-04 15:48:41 -0600 (Mon, 04 Dec 2006) | 2 lines

Fix an issue which didn't allow unavail/greet/busy/etc messages from being saved into ODBC (and probably IMAP).

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48249 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-04 21:49:38 +00:00
file 8693f486bf Merged revisions 48115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48115 | file | 2006-11-29 16:05:17 -0500 (Wed, 29 Nov 2006) | 2 lines

Use MAILTMPLEN instead of sizeof in mm_login. (issue #8420 reported by slimey)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48116 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-29 21:07:14 +00:00
file 92c4c39768 Merged revisions 48101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48101 | file | 2006-11-28 23:26:53 -0500 (Tue, 28 Nov 2006) | 2 lines

Don't crash if the mailstream was not created.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48102 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-29 04:28:21 +00:00
file d86306cb87 Merged revisions 48054 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48054 | file | 2006-11-27 13:06:50 -0500 (Mon, 27 Nov 2006) | 10 lines

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

........
r48053 | file | 2006-11-27 13:03:57 -0500 (Mon, 27 Nov 2006) | 2 lines

Use the proper function to get the new message count instead of always using the filesystem. (issue #8421 reported by slimey)

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48056 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-27 18:10:59 +00:00
tilghman 5199407168 Merged revisions 47864-47865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47864 | tilghman | 2006-11-20 14:01:58 -0600 (Mon, 20 Nov 2006) | 2 lines

Oops, merge missed release of odbc object

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47866 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-20 20:04:11 +00:00
murf 9ed9bbabf4 This update fulfils the request of bug 7109, which claimed the language arg to ast_stream_and_wait() was redundant. Almost all calls just used chan->language, and seeing how chan is the first argument, this certainly seems redundant. A change of language could just as easily be done by simply changing the channel language before calling.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47821 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-17 23:18:51 +00:00
qwell 9f5ca42bcf Add ability to notify an external application/script that the voicemail password was,
while also still changing the password "internally".

Issue 7371, initial patch by pdunkel, with rewrite/config comments by me.
Additional modifications (yay bitmask) by pdunkel.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47814 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-17 21:51:42 +00:00
tilghman d834b150ad Merged revisions 47709 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47709 | tilghman | 2006-11-15 15:56:55 -0600 (Wed, 15 Nov 2006) | 2 lines

Fix ODBC_STORAGE for when context is NULL

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47710 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-15 21:57:57 +00:00
kpfleming 2650e360ab Merged revisions 47693 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47693 | kpfleming | 2006-11-15 14:27:38 -0600 (Wed, 15 Nov 2006) | 12 lines

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

........
r47677 | kpfleming | 2006-11-15 11:56:42 -0600 (Wed, 15 Nov 2006) | 4 lines

ensure that message duration is included in email notifications for forwarded messages (BE-96, fix by me after corydon used his clue-bat on me)
ensure that duration in the message metadata is updated if prepending is done during forwarding (related to BE-96)
remove prototype for API call that does not exist

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47694 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-15 20:28:25 +00:00
file 55cddeadbb Merged revisions 47632 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47632 | file | 2006-11-14 17:17:16 -0500 (Tue, 14 Nov 2006) | 10 lines

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

........
r47631 | file | 2006-11-14 17:15:10 -0500 (Tue, 14 Nov 2006) | 2 lines

Update copyright information in the ADSI logo blob.

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47633 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-14 22:19:18 +00:00
tilghman d6e691ae01 Merged revisions 47621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47621 | tilghman | 2006-11-14 12:54:40 -0600 (Tue, 14 Nov 2006) | 3 lines

Conversion of res_odbc API to include ast_ prefix did not completely transition app_voicemail
when ODBC_STORAGE is used (reported on IRC by caio1982, not in bugtracker)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47622 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-14 18:58:15 +00:00
file cf7e97a806 Merged revisions 47398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47398 | file | 2006-11-09 17:32:30 -0500 (Thu, 09 Nov 2006) | 2 lines

Do conversion in a more easier to read and working way for \r, \n, and \t. (issue #8324 reported by johnlange)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47399 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-09 22:34:00 +00:00
russell 9783223be7 Merged revisions 47391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47391 | russell | 2006-11-09 16:26:27 -0500 (Thu, 09 Nov 2006) | 7 lines

Work around an issue that caused menuselect to display a bogus description for
app_voicemail and chan_zap.  These modules use some preprocessor directives to
determine what it will report to Asterisk as its description.  However, the way
we extract this information from the source files for menuselect is not smart
enough to figure this out.
(issue #8326, #8328)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47392 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-09 21:32:27 +00:00
murf 4d6996c27a A fair number of changes for the sake of bug 7506
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47290 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-07 21:47:49 +00:00
mogorman 83e15f05c5 rge overhaul to voicemail imap support. Allows support for more imap servers,
also a better implementation of several parts of the original work.
patch provided by 8033 with major upgrades. minor differences from 1.4 patch do to
changes in app_voicemail


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47278 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-07 18:50:58 +00:00
file 5e271d60c1 One has to create the path and filename in order to copy a file there. (issue #8278 reported by davebath)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47146 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-03 19:15:07 +00:00
tilghman 278341b071 Merged revisions 47051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47051 | tilghman | 2006-11-02 17:00:20 -0600 (Thu, 02 Nov 2006) | 2 lines

Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments"

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47052 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-02 23:16:09 +00:00
murf 3adc2400e7 This introduces Brazilian Portuguese via 7663
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46773 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-01 18:14:17 +00:00
oej 0b22be3874 Issue 8246 Doxygen updates (kshumard)
THANK YOU!



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46434 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-30 16:33:02 +00:00
oej 9b19aa3b31 Spelling fix.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46397 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-29 08:40:57 +00:00
russell 119d959274 Add the ability to customize some of the prompts used within the voicemail
application by configuring them in voicemail.conf (issue #7415, patch by
fkasumovic, with some fixes and documentation updates by myself)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46360 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-27 16:47:44 +00:00
russell b1b9710998 fix various spelling mistakes in comments (issue #8237, jmls)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46339 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-26 17:52:15 +00:00
kpfleming 470f688a28 Merged revisions 46200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46200 | kpfleming | 2006-10-25 09:32:08 -0500 (Wed, 25 Oct 2006) | 2 lines

apparently developers are still not aware that they should be use ast_copy_string instead of strncpy... fix up many more users, and fix some bugs in the process

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46201 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-25 14:44:50 +00:00
file 989829904e Fix indenting a bit (issue #8082 reported by selsky)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44516 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-05 20:13:04 +00:00
mogorman 4a1aaf52ae bug #8076 check option_debug before printing to debug channel.
patch provided in bugnote, with minor changes.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44253 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-03 15:53:07 +00:00
tilghman a91dc6e027 Remove locking conflict
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44033 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-29 20:16:30 +00:00
file 8d39395066 Finish up last commit
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43829 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27 21:41:25 +00:00
file 92cbbd56dc Do the directory walk dance instead of repeated stat calls as it seems to be faster (issue #7507 reported by Corydon76)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43827 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27 21:39:12 +00:00
tilghman 63d14e3b63 Merged revisions 43816 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43816 | tilghman | 2006-09-27 15:21:54 -0500 (Wed, 27 Sep 2006) | 10 lines

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

........
r43815 | tilghman | 2006-09-27 15:20:35 -0500 (Wed, 27 Sep 2006) | 2 lines

Avoid inability to lock directory log message by creating the directory ahead of time. (Issue 7631)

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43817 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27 20:27:03 +00:00
russell 7c564986b9 remote an unused buffer in mm_login() (issue #8038, selsky)
In passing, I have cleaned up some formatting to better comply with our
guidelines.  I have also changed one place to use S_OR(), and a couple of
places to use ast_strlen_zero() as appropriate.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43754 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27 04:28:37 +00:00
russell c7f0265b5f Merged revisions 43700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43700 | russell | 2006-09-26 16:24:39 -0400 (Tue, 26 Sep 2006) | 14 lines

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

........
r43699 | russell | 2006-09-26 16:23:15 -0400 (Tue, 26 Sep 2006) | 6 lines

When parsing the sections of voicemail.conf that contain mailbox definitions,
don't introduce a length limit on the definition by using a 256 byte temporary
storage buffer.  Instead, make the temporary buffer just as big as it needs
to be to hold the entire mailbox definition.
(fixes BE-68)

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43701 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-26 20:26:00 +00:00
tilghman 4dc96c2df6 MailboxExists should be a dialplan function, not an application (Issue 7503)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43659 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-26 16:56:07 +00:00
tilghman b3fdd459a0 Merged revisions 43642 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43642 | tilghman | 2006-09-25 17:07:44 -0500 (Mon, 25 Sep 2006) | 2 lines

Should have moved these lines up in the merge, instead of removing them

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43643 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-25 22:09:13 +00:00