]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merge fail.
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 4 Jun 2010 03:23:20 +0000 (03:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 4 Jun 2010 03:23:20 +0000 (03:23 +0000)
commit8b45031158accc894c1fa6f8e23a330302ddba9c
treebf44f3794c9ac14785ac91c626699c28dc44e760
parentf5297544fc8dc20ff9dfeb03b048313081f004d7
Merge fail.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
makeopts.in