darix just moved the svn-trees around. Now trunk/ is containing the code for 1.5.0 (formerly known as branches/lighttpd-merge-1.4.x) and branches/lighttpd-1.4.x is taking care of the 1.4.x series (formerly branches/lighttpd-1.4.11-ssl-fixes). "[1352]"://trac.lighttpd.net/trac/changeset/1352 got commited to the 1.4.x-branch to fix a crash in 1.4.12.