Merge branch 'shipherd_hotfix'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:19 +0000 (15:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:19 +0000 (15:49 -0400)
commit454e6844441dc1d4d624d89616bb9b21436f5fca
tree9228cfdf1eda6be8e61a41db22fa47272052ba88
parentb3fd01202e71b1a43ab372b8f19e9ff6f13dae7b
parent92e8e96c8d6814f3bd93ecd82d8da2ccb43e13c4
Merge branch 'shipherd_hotfix'