| commit | 01dc94640ea0eea8c0ebb6a4a7df33f07dcfb79e | |
| author | Ondrej Sukup <mimi.vx@gmail.com> | |
| Wed, 9 Sep 2009 22:32:37 +0000 (10 00:32 +0200) | ||
| committer | Ondrej Sukup <mimi.vx@gmail.com> | |
| Wed, 9 Sep 2009 22:32:37 +0000 (10 00:32 +0200) | ||
| tree | a7306d705c7850bec9e12d18df59da7cfe0e2d90 | treesnapshot (tar.gz zip) |
| parent | acaf949e75e5533a8d6a86a3d65a4249c1313e86 | commitdiff |
| parent | 90a6d1ce1c05c0083959407169b1290433c735f5 | commitdiff |
Merge branches 'master' and 'devel'