Merge branch 'ldap_parser' into database
authortanya <tanya@tanin.oblgaz>
Wed, 30 Dec 2009 14:03:03 +0000 (16:03 +0200)
committertanya <tanya@tanin.oblgaz>
Wed, 30 Dec 2009 14:03:03 +0000 (16:03 +0200)

Trivial merge