Merge remote-tracking branch 'glotzi/asterisk-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:12:53 +0000 (14:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:12:53 +0000 (14:12 +0200)

Trivial merge