]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad50a29 39d4356)
Merge remote-tracking branch 'amarx/BUG10797' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)

Trivial merge
Stefan's tree of IPFire 2.x.