tree 77efdf40b5f1e44c9af9de1da1d53e41160b6dee
parent d0b256f96d81d5577c619c3912db9a0e79a43b6c
parent e35d6943d513b4f016b763eebe8b97a9f1c902e3
author Andrey Andreev <narf@bofh.bg> 1329211784 +0200
committer Andrey Andreev <narf@bofh.bg> 1329211784 +0200

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