tree 349412385e03bab484bbbcf306a2b1d3d59988a7
parent 92849d9cc553693a3eda5efb6a648187f6ce6064
parent 352d60e9f3a65def29e02a4507ef742eac255333
author Andrey Andreev <narf@bofh.bg> 1325992987 +0200
committer Andrey Andreev <narf@bofh.bg> 1325992987 +0200

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