]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8086f3 b7f635a)
Merge branch 'guardian-improved' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire...
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 19 Oct 2014 18:00:04 +0000 (20:00 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 19 Oct 2014 18:00:04 +0000 (20:00 +0200)

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