tree 2ecb875361954cb848dac0e5c2eb5a2d898ad0f1
parent 9f3ce15bc1925f1b7d6e0b678dbf11f01f01a460
parent 002b4be248e448227a718e6f7d9ee39ccc575745
author Andrey Andreev <narf@bofh.bg> 1330519378 +0200
committer Andrey Andreev <narf@bofh.bg> 1330519378 +0200

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