]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de56278 e73a5ce)
Merge remote-tracking branch 'stevee/guardian-2.0' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Aug 2016 11:18:29 +0000 (12:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Aug 2016 11:18:29 +0000 (12:18 +0100)

Trivial merge
Michael's tree of IPFire 2.x.