| commit | 5f311317abb1b7fc35e512a22815abe567942474 | |
| author | Karel Matas <karel.matas@souko.cz> | |
| Tue, 2 Jul 2013 10:56:57 +0000 (2 12:56 +0200) | ||
| committer | Karel Matas <karel.matas@souko.cz> | |
| Tue, 2 Jul 2013 10:56:57 +0000 (2 12:56 +0200) | ||
| tree | bf76023d87569d8ba77121a069b96a2ddd25dd52 | treesnapshot (tar.gz zip) |
| parent | f35bfe44587bb8320a21f8357a8147a105433f3f | commitdiff |
| parent | c871f406be41699fc0a6af15d572e3b91a03071b | commitdiff |
Merge branch 'devel'
prealpha devel->master merge
prealpha devel->master merge