]> 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: 0ed7b61 1d47c97)
Merge remote-tracking branch 'amarx/BUG10834' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)

Trivial merge
IPFire 2.x development tree