fixup merge issues introduced in 796673c
authorDavid Kalnischkies <david@kalnischkies.de>
Sun, 26 Jan 2014 12:06:31 +0000 (13:06 +0100)
committerDavid Kalnischkies <david@kalnischkies.de>
Sun, 26 Jan 2014 15:21:25 +0000 (16:21 +0100)
commita0db467c7eb0e63b8e74887403689e2b446dde7f
treecada4ce1f4e6f15b8d2044d3be5546dbcfbffda4
parentabaf0b8831bfb415137b10f56d89d3180906be38
fixup merge issues introduced in 796673c

Issues in doc/po/de.po (fixed by Chris already) and
test/integration/framework

Git-Dch: Ignore
test/integration/framework