]> 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: 3a9c7a1 4cb7c9b)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jun 2014 10:41:47 +0000 (12:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jun 2014 10:41:47 +0000 (12:41 +0200)

Trivial merge
IPFire 2.x development tree