tree ff10f9ec35391d8b045aca8666aece66a35e0791
parent 7719a037c4648be714ebe577aa38acba012f7d90
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136819 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136819 +0200

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