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