| commit | fb0f5d14bc92290ec993e137e232ae542eebda00 | |
| author | Stepan Kasal <kasal@ucw.cz> | |
| Thu, 29 May 2014 09:09:12 +0000 (29 11:09 +0200) | ||
| committer | Stepan Kasal <kasal@ucw.cz> | |
| Thu, 29 May 2014 09:09:12 +0000 (29 11:09 +0200) | ||
| tree | 987343ece5c8865138b0d277e9ffcefb9ca95b66 | treesnapshot (tar.gz zip) |
| parent | 82c8da7c74d8e4e025b477cdb81ba29e3e77959c | commitdiff |
| parent | 552ca1b23d2e1302714899ea367fac62594c26a1 | commitdiff |
Merge 'criss-cross-merge' into HEAD