Merge remote-tracking branch 'refs/remotes/tilly-q/dev_tools_environment_update'...
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 5 Nov 2013 19:29:40 +0000 (13:29 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 5 Nov 2013 19:29:40 +0000 (13:29 -0600)

Trivial merge