]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit - src/installer/main.c
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)
commitf94223119075377b14f6c25c573be533f3681013
treeb319e50060ff645263af8d512df12d92522488d3
parentca6be40f92988ec3202e1f669c1a033bbbf3cd38
parent709564103eba30e14e25d4ebda86413dda823354
Merge remote-tracking branch 'glotzi/asterisk-update' into next