From: daid <daid@daid.mine.nu>
Date: Fri, 16 Dec 2011 17:43:33 +0000 (+0100)
Subject: Merge branch 'master' of github.com:daid/Skeinforge_PyPy
X-Git-Tag: RC1~185
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=42b77765a4e7c343e6d078005f7bdef99e846869;p=cura.git

Merge branch 'master' of github.com:daid/Skeinforge_PyPy
---

42b77765a4e7c343e6d078005f7bdef99e846869