From: Keith Packard <keithp@keithp.com>
Date: Thu, 27 Jun 2013 20:40:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=02e1ae3ec7dfff996aa78a3a3524e1027eeb9ded;p=jelmer%2Fcalypso.git

Merge remote-tracking branch 'origin/master'

Conflicts:
	calypso/__init__.py
---

02e1ae3ec7dfff996aa78a3a3524e1027eeb9ded