# 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 66a363cda955 -r 9cb5e43e688a .hgsubstate
--- a/.hgsubstate	Mon Jan 16 13:36:25 2012 +0100
+++ b/.hgsubstate	Mon Jan 16 13:36:27 2012 +0100
@@ -1,2 +1,2 @@
 3aaeece2ed2e681033d6b4d7335789219046f943 content
-2929093de78d512af7f7c6218aaa95042e95df31 rendered
+6817312b0cc66ec16eebda278dbcd471bf6acf82 rendered