| commit | f5d4ebeb98f9aadde89708cfc474fb1a407154db | |
| author | ygrek <ygrek@autistici.org> | |
| Fri, 11 Jan 2013 14:05:41 +0000 (11 16:05 +0200) | ||
| committer | ygrek <ygrek@autistici.org> | |
| Fri, 11 Jan 2013 14:05:41 +0000 (11 16:05 +0200) | ||
| tree | ffde941a15fea50f3f0c5ace9f571182c11f2b09 | treesnapshot (tar.gz zip) |
| parent | 0912a99f820fc717adf7db54916ed31a63341808 | commitdiff |
| parent | b565fad9ca70bdf9f8f965a6638f0ff9b400b32e | commitdiff |
Merge branch 'upstream'
Conflicts:
config/configure.in
Conflicts:
config/configure.in
| config/configure.in | diff1 | diff2 | blobhistory |