Alexandr Anikin 7bd3726d88 Merged revisions 328428-328429 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328428 | may | 2011-07-15 23:31:09 +0400 (Fri, 15 Jul 2011) | 13 lines
  
  Merged revisions 328427 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328427 | may | 2011-07-15 23:22:24 +0400 (Fri, 15 Jul 2011) | 7 lines
    
    small gk processing fixes:
    - decrease for 1 second registration ttl for very low expirations (some
      providers expire few earlier than TTL)
    - delete rrq and registration expire timers on URQ received as we make
      new registration.
  ........
................
  r328429 | may | 2011-07-15 23:35:50 +0400 (Fri, 15 Jul 2011) | 2 lines
  
  delete unproperly changed svn props
................


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

2011-07-15 21:41:46 +00:00

..

ooh323c

Merged revisions 328428-328429 via svnmerge from

2011-07-15 21:41:46 +00:00

app_mysql.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_saycountpl.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

cdr_mysql.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

chan_mobile.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

chan_ooh323.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

chan_ooh323.h

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

format_mp3.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

Makefile

Merged revisions 280742 via svnmerge from

2010-08-03 18:50:14 +00:00

ooh323cDriver.c

Merged revisions 308242 via svnmerge from

2011-02-18 00:11:06 +00:00

ooh323cDriver.h

Merged revisions 308242 via svnmerge from

2011-02-18 00:11:06 +00:00

res_config_mysql.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00