]> 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: 94d84c7 a788e50)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)

Trivial merge
Peter's tree of IPFire 2.x