]> 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: 0d80881 5b861b0)
Merge branch 'master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 26 Jul 2014 21:46:09 +0000 (23:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 26 Jul 2014 21:46:09 +0000 (23:46 +0200)

Trivial merge
IPFire 2.x development tree