]> 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: 7739c2d 7b91d99)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 13:47:58 +0000 (15:47 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 13:47:58 +0000 (15:47 +0200)

Trivial merge
IPFire 2.x development tree