]> 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: 59c2888 7a35d10)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1
authorAlexander Marx <amarx@ipfire.org>
Fri, 26 Sep 2014 10:53:05 +0000 (12:53 +0200)
committerAlexander Marx <amarx@ipfire.org>
Fri, 26 Sep 2014 10:53:05 +0000 (12:53 +0200)

Trivial merge
IPFire 2.x development tree