# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1335783376 -7200
# Node ID f5844bc29d3096a65bb9a5e9fc39e9485bffc889
# Parent  4160b352322eaa91735e5954cae8677a2d469036# Parent  feb730d8565da255cf95dca89057e283f25ab03f
Merge branch 'stable'

diff -r 4160b352322e -r f5844bc29d30 index.html