]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9c3bcb9 65c9b3a)
Merge remote-tracking branch 'amarx/beta3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Mar 2014 11:25:12 +0000 (12:25 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Mar 2014 11:25:12 +0000 (12:25 +0100)

Trivial merge
Timo's tree of IPFire 2.x