diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-01-26 13:06:31 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-01-26 16:21:25 +0100 |
| commit | a0db467c7eb0e63b8e74887403689e2b446dde7f (patch) | |
| tree | cada4ce1f4e6f15b8d2044d3be5546dbcfbffda4 /test/integration/status-bug-591882-conkeror | |
| parent | abaf0b8831bfb415137b10f56d89d3180906be38 (diff) | |
fixup merge issues introduced in 796673c
Issues in doc/po/de.po (fixed by Chris already) and
test/integration/framework
Git-Dch: Ignore
Diffstat (limited to 'test/integration/status-bug-591882-conkeror')
0 files changed, 0 insertions, 0 deletions