tree 024d74079f8c1bd0ffa026bd3e7047a0461a1c00
parent 21109696ca6f2500cc642b8445b9e034353197a4
parent 002b4be248e448227a718e6f7d9ee39ccc575745
author Andrey Andreev <narf@bofh.bg> 1330519276 +0200
committer Andrey Andreev <narf@bofh.bg> 1330519276 +0200

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