tree 9267a486240973ad7a774ecbdfc1cd5e627d567f
parent 9ab8d20ca8249047d2228ba183059d69b20a4e0d
parent 002b4be248e448227a718e6f7d9ee39ccc575745
author Andrey Andreev <narf@bofh.bg> 1330518768 +0200
committer Andrey Andreev <narf@bofh.bg> 1330518768 +0200

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