Merge remote-tracking branch 'matt-davis/master'
authorW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 22:06:48 +0000 (17:06 -0500)
committerW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 22:14:27 +0000 (17:14 -0500)
commit4398bfed7a2c57077b6d01b39b417caffd2a4c01
tree50c307afdfd0f4039ecade06510234ce8702567e
parent2a5f773d41b81f3b1c074378c6646d197edbbed9
parent603c22cd0599b9b38269063ad603c29e6c4ef05c
Merge remote-tracking branch 'matt-davis/master'

Streamlined workshop-branch description.  I've fixed some encoding
issues in Matt's verison.
repository