# HG changeset patch
# User Daniel Poelzleithner <poelzi@poelzi.org>
# Date 1286248607 -7200
# Node ID 082450e65aa88390f0edb558e7b94ac4f4829ca5
# Parent  4fb486bce60819f4d4464d6977427b9bec1fc122# Parent  e5a221e57dc6b1d4e137e6370cb99f8bc49a4da4
merge

diff -r 4fb486bce608 -r 082450e65aa8 app/main/_layout/default.html
diff -r 4fb486bce608 -r 082450e65aa8 locale/translations.de.lua