From: W. Trevor King <wking@tremily.us>
Date: Sat, 30 Nov 2013 19:31:23 +0000 (-0800)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1fc169e5aee0782925bb2bfbbd193af9fd2c3f83;p=swc-workshop.git

Merge branch 'master' into namespaced

* master:
  swc-installation-test-2.py: Prefer pip to easy_install
---

1fc169e5aee0782925bb2bfbbd193af9fd2c3f83