]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Let's try using an automerge-propname, since we have multiple heads.
authorJason Parker <jparker@digium.com>
Tue, 12 Jun 2012 16:15:41 +0000 (16:15 +0000)
committerJason Parker <jparker@digium.com>
Tue, 12 Jun 2012 16:15:41 +0000 (16:15 +0000)
commit717f24861274df88d9df85ea96433b332604cbdf
tree2a13a79173e41f42d70f0e4c3f2ae5ec6a49f1a3
parent6194c372bd0d207411082c4038e75f65c1fc48cc
Let's try using an automerge-propname, since we have multiple heads.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@368811 65c4cc65-6c06-0410-ace0-fbb531ad65f3