]> 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: a91fd50 214cc7b)
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Jan 2015 13:42:30 +0000 (14:42 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Jan 2015 13:42:30 +0000 (14:42 +0100)

Trivial merge
IPFire 2.x development tree