# HG changeset patch
# User Arne Babenhauserheide <bab@draketo.de>
# Date 1320833634 -3600
# Node ID fe164081afd8d4607379b709ffd789ab94af6bb2
# Parent  67c7ba029d2309535491e8cfd597111274d0a688# Parent  e8ba58210bb58943bf9556b988e10b4c86fd3665
merge

diff -r e8ba58210bb5 -r fe164081afd8 .hgsubstate
--- a/.hgsubstate	Mon Nov 07 18:21:15 2011 +0100
+++ b/.hgsubstate	Wed Nov 09 11:13:54 2011 +0100
@@ -1,2 +1,2 @@
-50d09fc1577cba0d854b2ce98069e428a361470a content
+25e3001f530246f2e61496eb1b186645a4d4f464 content
 33676545c6cb666bcddc1b4abfcad92810a0ff19 rendered