]> 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: 3ed94af 5ca4ae1)
Merge remote-tracking branch 'amarx/BUG10756' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Mar 2015 20:13:46 +0000 (21:13 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Mar 2015 20:13:46 +0000 (21:13 +0100)

Trivial merge
IPFire 2.x development tree