tree 0d9af9a2611c1712bbb33a81265b226f96e622aa
parent 75b0e8ef75934a64c5289752d393884230ec8712
parent e35d6943d513b4f016b763eebe8b97a9f1c902e3
author Andrey Andreev <narf@bofh.bg> 1329211663 +0200
committer Andrey Andreev <narf@bofh.bg> 1329211663 +0200

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