# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1326717387 -3600
# Node ID 9cb5e43e688a58dd08d77c0f221a5e7137dbb8bd
# Parent  55700bd65a4f0fe5dc6c74ba488cab76ae6194b2# Parent  66a363cda95507ce227b7167ae77069fc32eae12
Merge with Arne

diff -r 55700bd65a4f -r 9cb5e43e688a .hgsubstate