Fix 'alembic branches' merge conflict as described by the web page.
authorRichard Mudgett <rmudgett@digium.com>
Wed, 26 Mar 2014 16:05:00 +0000 (16:05 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 26 Mar 2014 16:05:00 +0000 (16:05 +0000)
commit4b18b3bb4d68217b1d69f8cee848ab89691f4a73
tree0fcb0ecd886416cf385206539762247f6d923e24
parentc32fe8b8e50f9b494bddc2bb63cd2bb1ed02ba57
Fix 'alembic branches' merge conflict as described by the web page.
........

Merged revisions 411191 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py