tree 329b8a2faf0f7170a0222a81e3d3f81fb5a998d3
parent daf8e046258c0f6ef82427cb9023247cc89830bc
parent c02558b78fcf32fc99cdf974ee349881c89b4213
author Donal Fellows <donal.k.fellows@manchester.ac.uk> 1396962586 +0100
committer Donal Fellows <donal.k.fellows@manchester.ac.uk> 1396962586 +0100

Merge branch 'shell-fix' into core