]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bda23f 36c92ab)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:36 +0000 (14:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:36 +0000 (14:14 +0100)

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