tree 6635eda43e986e11bcf11a7d04df6ec3db81912d
parent 2e430a3f3b160641c36037fbaf92457e0b3bb51e
parent de7da338e21885b9ecc4f5a64ba77ee8475960d2
author Andrey Andreev <narf@bofh.bg> 1329082726 +0200
committer Andrey Andreev <narf@bofh.bg> 1329082726 +0200

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