From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 3 Sep 2012 08:06:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.eng.unimelb.edu.au/public?p=python-guide.git;a=commitdiff_plain;h=a6314062a07285840429eaf7b521de850bf29130

Merge remote-tracking branch 'origin/master'
---

a6314062a07285840429eaf7b521de850bf29130