| commit | c2c4694469be036120156d16364c7a822c744094 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Mar 20 16:11:52 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Mar 20 16:11:52 2012 +0200 |
| tree | c00ba55ae279443718a868a4a87d2c0dffca75ed | |
| parent | 242500d51695e4177ec99a3221086f51f55c8862 [diff] | |
| parent | c066481ed558e764ab489449141d2489551b562f [diff] |
Merge upstream branch