Merge branch 'asterisk-update' into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Fri, 9 May 2014 11:48:03 +0000 (13:48 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Fri, 9 May 2014 11:48:03 +0000 (13:48 +0200)
commite8cee92b70064358871ce28c1c8d84cc1a297d0c
tree76a71d23db3312ea5778653ffb681bef6db86387
parent2beef649d438da5bda0a2df81e4601de54668487
parent28b8e0ec070adeb0cb8231814d355b7e1e3f56e9
Merge branch 'asterisk-update' into monit