# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1336079894 -7200
# Node ID a38c8f7515f037a0f688d5c3215decd67a8045b2
# Parent  8db5a297f243f70ff38ad184725555e6aa113f30# Parent  9a0fd1a69bbe1d944a7fbc8f6369abe1329630f4
Merge branch 'stable'

diff -r 8db5a297f243 -r a38c8f7515f0 index.html