From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Apr 2015 12:12:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'glotzi/asterisk-update' into next
X-Git-Tag: v2.17-core91~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f94223119075377b14f6c25c573be533f3681013;p=people%2Fstevee%2Fipfire-2.x.git

Merge remote-tracking branch 'glotzi/asterisk-update' into next
---

f94223119075377b14f6c25c573be533f3681013