tree ea03a1cb05ea998768a3b333978c149d989d5ff9
parent f00755897697aebbd3a8795bde7741ea547c5909
parent d48c200390d58d53efc3b89f9226179c48c9aee1
author Neil GM Richards <neil_richards@uk.ibm.com> 1432734663 -0400
committer Neil GM Richards <neil_richards@uk.ibm.com> 1432734663 -0400

Merge branch 'bidir-deadlock' into 'ibm-trunk'

Bidir deadlock

See merge request !49