]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2beef64 28b8e0e)
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)

Trivial merge
Peter's tree of IPFire 2.x