]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65ae6b2 1d0547d)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Jun 2015 12:27:57 +0000 (12:27 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Jun 2015 12:27:57 +0000 (12:27 +0000)

Trivial merge
Alex's tree of IPFire 3.x