]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ad3e3d 38b8efd)
Merge remote-tracking branch 'origin' into next
authorMatthias Fischer <fischerm@ipfire.org>
Thu, 28 May 2015 11:23:47 +0000 (13:23 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Thu, 28 May 2015 11:23:47 +0000 (13:23 +0200)

Trivial merge
Peter's tree of IPFire 2.x