Merged revisions 295441 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Thu, 18 Nov 2010 18:08:43 +0000 (18:08 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Thu, 18 Nov 2010 18:08:43 +0000 (18:08 +0000)
commit767af0dbc4f9a51d6d3db858f77935a2c26db66b
treed7ef36c1dda6e3d97e6b6054c2c6776629fdb733
parent38926fce3cbececc31d1df806e1a6b3d7416cc9e
Merged revisions 295441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295441 | pabelanger | 2010-11-18 13:02:12 -0500 (Thu, 18 Nov 2010) | 11 lines

  Merged revisions 295440 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r295440 | pabelanger | 2010-11-18 12:51:34 -0500 (Thu, 18 Nov 2010) | 4 lines

    Fix compiler warnings when using openssl-dev 1.0.0+

    Review: https://reviewboard.asterisk.org/r/1016/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/jabber.h
res/res_jabber.c