]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge topic 'certified-13.1' into certified/13.1
authorJoshua Colp <jcolp@digium.com>
Wed, 22 Apr 2015 21:35:55 +0000 (16:35 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 22 Apr 2015 21:35:55 +0000 (16:35 -0500)
* changes:
  Detect potential forwarding loops based on count.
  More .gitignore updates
  .gitignore updates for master/13


Trivial merge