]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 377994 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 13 Dec 2012 21:17:50 +0000 (21:17 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 13 Dec 2012 21:17:50 +0000 (21:17 +0000)
file:///srv/subversion/repos/asterisk/trunk

........
  r377994 | dlee | 2012-12-13 15:15:44 -0600 (Thu, 13 Dec 2012) | 1 line

  Fixed svn merge property breakage from r377986
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377996 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found