# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1279149447 -7200
# Node ID 0c1465761c71b3231acb4bfbb5a468797f7be7b9
# Parent  7f3c9f000db1b6b52121f4733643194331bae833# Parent  009e21f047444037ed9f9ce7140248b3e9f8bd1c
Merge

diff -r 009e21f04744 -r 0c1465761c71 .hgsubstate
--- a/.hgsubstate	Wed Jul 14 08:19:04 2010 +0200
+++ b/.hgsubstate	Thu Jul 15 01:17:27 2010 +0200
@@ -1,2 +1,2 @@
-462c9cfd0e60057b0c6398532c20233e79b85f24 content
-feaad641cc37fc6e5ad2f5892e877caf86857086 rendered
+f861725376884da5b36c4d908ab326b7e865f927 content
+03513d864a37ecd7ce16d4acafa07b8eac3f841c rendered