From: Richard Oudkerk <shibturn@gmail.com>
Date: Sat, 18 May 2013 17:13:16 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850800f15ef3cfa51dfafbc41a1bb574fb542ded;p=python

Merge.
---

850800f15ef3cfa51dfafbc41a1bb574fb542ded