From: Automerge script <automerge@asterisk.org>
Date: Thu, 13 Dec 2012 21:17:50 +0000 (+0000)
Subject: Merged revisions 377994 via svnmerge from
X-Git-Tag: 13.0.0-beta1~2194^2~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9037da8dc09ac12f0109c7d901c33dbc36d2386;p=thirdparty%2Fasterisk.git

Merged revisions 377994 via svnmerge from
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
---