]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: bfb421f dc3de45)
Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)

Trivial merge
IPFire 2.x development tree