# HG changeset patch
# User Dan
# Date 1231212626 18000
# Node ID 186507f67064cc439bb4c950d84ba0212e2204f0
# Parent  73f74d395f9538c18f9cd0f9e56a2f18b6575396# Parent  53a50ba4d690c4131dba62d6d0e003eee697125c
Merging heads

diff -r 73f74d395f95 -r 186507f67064 htdocs/index.php
diff -r 73f74d395f95 -r 186507f67064 htdocs/news.php