20140904 home morning
Merge branch 'master' of github.com:andrew0snake/1.23

Conflicts:
	ldap_decoder
	ldap_decoder.c
	tests/tmp
	tests/tmp_decoded
	tmp
20140905 night;almost...)