]> 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: 8225c4f 7429ee7)
Merge remote-tracking branch 'amarx/beta3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:45 +0000 (14:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:14:45 +0000 (14:14 +0100)

Trivial merge
Timo's tree of IPFire 2.x