MG-RAST/Shock — pull request #229 by jaredbischof (2014-09-24 21:34:56+00:00)
Title: Merge pull request #228 from MG-RAST/master

Updating develop with master