]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'asterisk-update' into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 09:07:58 +0000 (11:07 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 09:07:58 +0000 (11:07 +0200)
commita1f23a84c7c5b60bf87b30a19451214e59793b9a
tree9f03658c3d26356a14d50f661d5928c32fe1fc34
parent9ac9fc3d802db666b94cc85175bef2cfbd335ed5
parent65418d1d211b9425013b0f8dcefa9b944a62d1bb
Merge branch 'asterisk-update' into monit

Conflicts:
config/etc/logrotate.conf
config/rootfiles/packages/asterisk
make.sh