]> 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: 1eec848 309b7de)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 11 Feb 2015 13:58:10 +0000 (14:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 11 Feb 2015 13:58:10 +0000 (14:58 +0100)

Trivial merge
IPFire 2.x development tree