| commit | b16fe63e5cc21e8ced3886bed1f3bdba1e0184e6 | |
| author | Stepan Kasal <kasal@ucw.cz> | |
| Wed, 16 Apr 2014 14:34:09 +0000 (16 16:34 +0200) | ||
| committer | Stepan Kasal <kasal@ucw.cz> | |
| Wed, 16 Apr 2014 14:34:09 +0000 (16 16:34 +0200) | ||
| tree | 2f30075c24ea6d603ef15a06dcb0463b6c0fcfe6 | treesnapshot (tar.gz zip) |
| parent | 0ad5c62e226ca6eb2963bf6614eeb68612b118ce | commitdiff |
| parent | 5221d6e9fa6b59744abc56befbad51b681516f95 | commitdiff |
Merge 'criss-cross-merge' into HEAD