tree f8cd2e8a16ccfd438608181ccc0c8c7d46d31f80
parent 04e976604916248832822e43b9fcf28d43aaa6db
parent 0209c70195384308f06a6c0fc42693c1c649cf46
author Andrey Andreev <narf@bofh.bg> 1328736726 +0200
committer Andrey Andreev <narf@bofh.bg> 1328736726 +0200

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