block the indicated 1.2 branch from being merged into trunk; it's already here.
authorSteve Murphy <murf@digium.com>
Tue, 15 Aug 2006 22:37:33 +0000 (22:37 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 15 Aug 2006 22:37:33 +0000 (22:37 +0000)
commit7367a43547ca5a2d4d77ed9d34c64d40b9e09467
treedb20534be0036d7f45b58ed333244d8adee314bd
parentfff5a55af62e01b096d59ac3cca019653e2343b5
block the indicated 1.2 branch from being merged into trunk; it's already here.

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