| commit | d52fc74055807dc128ac4a80df1cedf12dd67be9 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 11 Dec 2015 22:30:57 +0000 (11 23:30 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 11 Dec 2015 22:30:57 +0000 (11 23:30 +0100) | ||
| tree | f64c8ea2816ab45ae38bfa1a650139942f6dff28 | treesnapshot (tar.gz zip) |
| parent | 418b2a0b18ac969e4ae68da2a0674fad7f197f37 | commitdiff |
| parent | f05b42d3fd30bb9673cc1ac1ee8c2af8f669964e | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
po/hu.po
po/tr.po
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
po/hu.po
po/tr.po
Signed-off-by: Stefan Weil <sw@weilnetz.de>