commit | dd2c41fd5aa8be936badd9ef21a8a73cb40541ea | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 21:26:14 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 21:26:14 2012 +0200 |
tree | c2b84e74855b707844fa3d2477b449efc100012a | |
parent | fe3428ae6c3a563e2ada653e3d099231827c2c3d [diff] | |
parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 [diff] |
Merge upstream branch