]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6795e2b 581f19d)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Sun, 15 Jun 2014 20:02:23 +0000 (22:02 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sun, 15 Jun 2014 20:02:23 +0000 (22:02 +0200)

Trivial merge
IPFire 2.x development tree