tree ac9dfe342da86c3e636086b811e8f4ea42941607
parent bd601d3d18531fa543ee57befac7cba6739c419b
parent e35d6943d513b4f016b763eebe8b97a9f1c902e3
author Andrey Andreev <narf@bofh.bg> 1329211707 +0200
committer Andrey Andreev <narf@bofh.bg> 1329211707 +0200

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