From: Walter Doekes <walter+asterisk@wjd.nu>
Date: Mon, 7 Apr 2014 14:53:02 +0000 (+0000)
Subject: Blocked revisions 411809
X-Git-Tag: 13.0.0-beta1~376
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a625471bf162b0e77d6c58477d011a5dd9a7e727;p=thirdparty%2Fasterisk.git

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
---