]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afc6dda b5fa638)
Merge remote-tracking branch 'stevee/hostapd'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jul 2011 20:41:18 +0000 (22:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jul 2011 20:41:18 +0000 (22:41 +0200)

Trivial merge
IPFire 3.x development tree