]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c7e145 34b59fe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Apr 2013 12:26:49 +0000 (14:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Apr 2013 12:26:49 +0000 (14:26 +0200)

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