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)
commitaa17799274faef4de5cb19886ec4e19123b6155c
treec78cd8e7fa651720b52a2fc0e0f884b08de1f87c
parenta3ffd611f74de63a596d9b6e3cc973ac63382260
parentc941e97a41092639f80afac40ac9fdcd7701e230
Merge branch 'ldap_parser' into database