]> 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: afdf148 e1c540b)
Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)

Trivial merge
IPFire 2.x development tree