commit | 6f7af78e253ddcff3770c5497f804367b098d09b | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Wed Feb 29 14:44:51 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Wed Feb 29 14:44:51 2012 +0200 |
tree | 66d090479dfbd7800d866d2cb005593d03b8305b | |
parent | 4f7ea7072281ea8e400a08bda2b67a8b5c5bdf20 [diff] | |
parent | 002b4be248e448227a718e6f7d9ee39ccc575745 [diff] |
Merge remote-tracking branch 'upstream/develop' into develop-issue-863