]> git.ipfire.org Git - people/trikolon/ipfire-2.x.git/commitdiff
projects / people / trikolon / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b21d4f8 dcfc633)
Merge remote-tracking branch 'stevee/proxy-cgi-ldap-hostname' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 26 Jan 2013 19:10:10 +0000 (20:10 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 26 Jan 2013 19:10:10 +0000 (20:10 +0100)

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