| commit | 6fbdcadc95ab66f5d9a9758934ca9aa29afde0bb | |
| author | Jakub Adam <jakub.adam@ktknet.cz> | |
| Tue, 10 Jan 2012 11:27:37 +0000 (10 12:27 +0100) | ||
| committer | Jakub Adam <jakub.adam@ktknet.cz> | |
| Tue, 10 Jan 2012 11:27:37 +0000 (10 12:27 +0100) | ||
| tree | 7d1592ffd87e6e09bfc43cbdc08ddb9c693b71c6 | treesnapshot (tar.gz zip) |
| parent | b04d7a5fa2b4772ae0337fb88de010d272ed6b11 | commitdiff |
| parent | 0f98a95eadd170a7f4b81e05a167abe436340f1b | commitdiff |
Merge commit 'upstream/1.1.0'