]> 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: 84c87c3 1f15cc0)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sun, 14 Jun 2015 22:43:43 +0000 (00:43 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Sun, 14 Jun 2015 22:43:43 +0000 (00:43 +0200)

Trivial merge
IPFire 2.x development tree