]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
projects / people / stevee / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b1af63 91d1c8a)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Feb 2013 21:51:19 +0000 (22:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Feb 2013 21:51:19 +0000 (22:51 +0100)

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