tree 544256b93093fe5e0fb468c39d46846245c362e0
parent 78b24bfdaaea0f208802f36730c032e7ec98eb56
parent a5a2cfef881f4cb70729b854e2e86932f28c43f6
author Andrey Andreev <narf@bofh.bg> 1330526651 +0200
committer Andrey Andreev <narf@bofh.bg> 1330526651 +0200

Merge remote-tracking branch 'upstream/develop' into develop-db-odbc