tree 525db727443270cf5937570e9387ba2e46e0ed6f
parent 4d5a0c9477272408799e870e9d27e537d66ecc1c
parent b211adee89f5fd2192051e9c0826146bd150f469
author Andrey Andreev <narf@bofh.bg> 1328211392 +0200
committer Andrey Andreev <narf@bofh.bg> 1328211392 +0200

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