]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38ca33d 90b0389)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Mar 2014 14:07:26 +0000 (15:07 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Mar 2014 14:07:26 +0000 (15:07 +0100)

Trivial merge
IPFire 2.x development tree