]> 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: 32a5fec 212fd68)
Merge remote-tracking branch 'amarx/BUG10796' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)

Trivial merge
IPFire 2.x development tree