]> git.ipfire.org Git - thirdparty/asterisk.git/commit
projects / thirdparty / asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1460caa) | patch
Revert merge of r306999, due to merge conflict.
authorJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:47:20 +0000 (15:47 +0000)
committerJason Parker <jparker@digium.com>
Tue, 9 Aug 2011 15:47:20 +0000 (15:47 +0000)
commit6e937b1b632c9fa4d801df9dbb5bf63793f64d76
tree5b38fea12fe7c8afa8ddd2da820b249870ff50aatree
parent1460caabedd8682f7c85640ea70eb5876e850a74commit | diff
Revert merge of r306999, due to merge conflict.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@331138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/asterisk.conf.sample diff | blob | blame | history
configs/voicemail.conf.sample diff | blob | blame | history
doc/asterisk.8 diff | blob | blame | history
doc/asterisk.sgml diff | blob | blame | history
Mirror of https://github.com/asterisk/asterisk.git