# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1321186491 -3600
# Node ID 85e290c9b474e2603bbdd126e4e0c9d2bce08f89
# Parent  7129a490d67ee18e5712f7c094f59352c83d549a# Parent  c9ca0d691c2696c2d2b965e8dfd643c3d7904c50
Merge with Arne

diff -r c9ca0d691c26 -r 85e290c9b474 .hgsubstate
--- a/.hgsubstate	Thu Nov 10 13:50:59 2011 +0100
+++ b/.hgsubstate	Sun Nov 13 13:14:51 2011 +0100
@@ -1,2 +1,2 @@
 a856a9e684112e50eae19352b6b2a2166de2c033 content
-33676545c6cb666bcddc1b4abfcad92810a0ff19 rendered
+4ba63b5976857ea6c64185832502a86edb0d2bb6 rendered