block appropriate revisions from being merged from 1.2 ...
authorRussell Bryant <russell@russellbryant.com>
Mon, 16 Jan 2006 01:32:46 +0000 (01:32 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 16 Jan 2006 01:32:46 +0000 (01:32 +0000)
commit4d9a267d0a4642da7e0213cde428d5f324678821
treee823f75c86c3934f803eecfdde56bcb280900ef8
parent2dec3747df6e753db25d810bf7d791ac919a2d3d
block appropriate revisions from being merged from 1.2 ...

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