]> 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: 0ee35ce 382ffe3)
Merge remote-tracking branch 'amarx/core90' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)

Trivial merge
IPFire 2.x development tree