]> 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: b013822 07e1b6c)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 22 Apr 2015 16:25:25 +0000 (18:25 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 22 Apr 2015 16:25:25 +0000 (18:25 +0200)

Trivial merge
IPFire 2.x development tree