tree e5d48c3ae9ca6aea4b9799fb836eb72aa78be0ac
parent d377082bab6685fac221a0e6add22b6ab5d5bcc2
parent 16af6afe991381360439135ddb0735dab1280fed
author Andrey Andreev <narf@bofh.bg> 1328877453 +0200
committer Andrey Andreev <narf@bofh.bg> 1328877453 +0200

Merge remote-tracking branch 'upstream/develop' into develop-issue-863