tree df3428dbd3bde5597f4f187116bcc4356743b304
parent b76029d8be1f2d98f1668d61e7f7ac3d9274b8f3
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136840 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136840 +0200

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