]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a50dadc 6e8089a)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 19:30:50 +0000 (21:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 19:30:50 +0000 (21:30 +0200)

Trivial merge
Timo's tree of IPFire 2.x