]> 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: 6b6730a 2be0bc4)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:17:12 +0000 (14:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:17:12 +0000 (14:17 +0200)

Trivial merge
IPFire 2.x development tree