| commit | 82f25bf2feeddee4fac32588d35d1924e2ffed76 | |
| author | Stepan Kasal <kasal@ucw.cz> | |
| Thu, 15 May 2014 07:43:58 +0000 (15 09:43 +0200) | ||
| committer | Stepan Kasal <kasal@ucw.cz> | |
| Thu, 15 May 2014 07:43:58 +0000 (15 09:43 +0200) | ||
| tree | 922f01280160b6a6f3c81e3d8756eae69d343de5 | treesnapshot (tar.gz zip) |
| parent | cb2e411808ddd33e12f9219ed70196d2b892870d | commitdiff |
| parent | 66bca8fc2fea0064c9d8b0e1c854923c52668cf3 | commitdiff |
Merge 'criss-cross-merge' into HEAD