# HG changeset patch
# User matthiasm
# Date 1400693682 -3600
# Node ID 28437904bd38458125043b4d6a711a9989510afb
# Parent  c01dd6ee127cf8ad25722f85b5a6e95a3ca4d039# Parent  2c19b0537bd2d2b97e52be20f89b5871d160d5f3
merge

diff -r 2c19b0537bd2 -r 28437904bd38 .hgsubstate
--- a/.hgsubstate	Wed May 14 10:02:33 2014 +0100
+++ b/.hgsubstate	Wed May 21 18:34:42 2014 +0100
@@ -1,4 +1,4 @@
-0ca7c7e21991b7cf5c6c4306af64280947d0b357 chp
+f82a28c2209fafa3a7f6568b08e99192508d178d chp
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 d1f89559321a4a194bf98c43bb1df88c82ce1078 pyin
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds