| commit | 9d12ceb63616b3c334f9eb64312aa7af9ad328ff | [log] [tgz] |
|---|---|---|
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | Wed Jul 28 14:33:17 2010 +0000 |
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | Wed Jul 28 14:33:17 2010 +0000 |
| tree | de566b06e715eb3234722c1324d76e9e59f26e96 | |
| parent | ca23784e42941f7c2880e9307e0115d7fca3ebf2 [diff] |
Redo r83142 merge manually. QOTD: svnmerge isn't really your best friend