]> 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 | combined (merge: ae77e0b 1d3c374)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Mon, 14 Apr 2014 11:12:14 +0000 (13:12 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Mon, 14 Apr 2014 11:12:14 +0000 (13:12 +0200)

Trivial merge
Peter's tree of IPFire 2.x