# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1349700185 -7200
# Node ID e5245ccc4485fcb81c4052eea1a839ed1cfb31db
# Parent  fb06baf9132a68eb679740be589f4715c9961223# Parent  a4f838edafd47857c602233a614b59c989a7320c
Merge branch 'stable'

diff -r fb06baf9132a -r e5245ccc4485 index.html