Merge branch 'master' into 2199-crunch-virtualenv
authorTom Clegg <tom@floater1.office.curoverse.com>
Fri, 21 Feb 2014 15:14:13 +0000 (10:14 -0500)
committerTom Clegg <tom@floater1.office.curoverse.com>
Fri, 21 Feb 2014 15:14:13 +0000 (10:14 -0500)
commitd9b57edd7f14f674a7fa33373471c17e3b443230
tree9dea2672c4ccaefe9c9fe911162691130cdb83d2
parentdfa8eb5554bca6e0b593fa189a6e05ebad69ea52
parentbf1efb4b1752f0c04c3ab477e0733ffd04005c3c
Merge branch 'master' into 2199-crunch-virtualenv