tree 7ca98882d3e9e639686ccab45eb0eff0e5897d7d
parent dd2c41fd5aa8be936badd9ef21a8a73cb40541ea
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136536 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136536 +0200

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