tree 9f4a92f9da7d15e82336a9c823dba854266de52c
parent 99cfa80a4d637892930505650c3f6cf74ae3a300
parent 0aa8c60ae7eee0122c42ae17d42fd5471a575743
author Andrey Andreev <narf@bofh.bg> 1330433481 +0200
committer Andrey Andreev <narf@bofh.bg> 1330433481 +0200

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