From: W. Trevor King <wking@drexel.edu>
Date: Fri, 12 Nov 2010 17:40:38 +0000 (-0500)
Subject: Merge remote branch 'borg/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=852461248f3316d39e5633f0d2cedf5271115ebf;p=parallel_computing.git

Merge remote branch 'borg/master'
---

852461248f3316d39e5633f0d2cedf5271115ebf