projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8af8d5d 0cd7141)
Merge remote-tracking branch 'amarx/wlanap' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 16:32:59 +0000 (17:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 16:32:59 +0000 (17:32 +0100)

Trivial merge
Timo's tree of IPFire 2.x