Blocked revisions 411809
authorWalter Doekes <walter+asterisk@wjd.nu>
Mon, 7 Apr 2014 14:53:02 +0000 (14:53 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Mon, 7 Apr 2014 14:53:02 +0000 (14:53 +0000)
commita625471bf162b0e77d6c58477d011a5dd9a7e727
tree79bc883fa14973ce3c804383e3533ced250a35d2
parent62e2bf68f0ccf3c9276d8a8581482e98373e788b
Blocked revisions 411809

........
configs: Clean up long line and typo in res_odbc.conf.sample.
........

Merged revisions 411807 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 411808 from http://svn.asterisk.org/svn/asterisk/branches/11

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