| commit | 943cea52c1944f419ee17015f76f13ad1ca797f0 | |
| author | ygrek <ygrek@autistici.org> | |
| Sun, 15 Aug 2010 17:13:34 +0000 (15 20:13 +0300) | ||
| committer | ygrek <ygrek@autistici.org> | |
| Sun, 15 Aug 2010 17:13:34 +0000 (15 20:13 +0300) | ||
| tree | 7630d88c3a8634ce6904a02405aeb23c585e2a08 | treesnapshot (tar.gz zip) |
| parent | 2be688b63b4ab0f354fce22f8b8e9c7b925219fa | commitdiff |
| parent | 65f747825ec28f5c6dfc1600ec85e9aaf4d8a859 | commitdiff |
Merge branches 'upstream' and 'dev/fix'