tree 2b4390f13c2d0961cbdb846a81272e58d04894ad
parent a19fb3eea3591f7ee38fec1c64ded0ea0e2f5885
parent 002b4be248e448227a718e6f7d9ee39ccc575745
author Andrey Andreev <narf@bofh.bg> 1330519314 +0200
committer Andrey Andreev <narf@bofh.bg> 1330519314 +0200

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