commit | 7a189e81c0335f0d3667c1e8270f06137177d9b0 | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 21:13:52 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 21:13:52 2012 +0200 |
tree | 082299080d2364538de758d05b49b15a89938aa9 | |
parent | fb86295d7d49e7ddfba266fe9f7305fb44708d4f [diff] | |
parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 [diff] |
Merge upstream branch