bc1c6a40fce992bfe042b59d9307963683ef467a - geronimo-yoko

commit: bc1c6a40fce992bfe042b59d9307963683ef467a
[log]
author: Neil GM Richards <neil_richards@uk.ibm.com>
Mon Jun 20 22:02:47 2016 -0400
committer: Neil GM Richards <neil_richards@uk.ibm.com>
Mon Jun 20 22:02:47 2016 -0400
tree: 5275306562618db657c4c756769fa6fa766dcc19
parent: 2550cc087b526a2ed77a2a9d222f3030ff13ed62 [diff]
parent: f7c60eddd552e7a8683515bccfa1c5baacd840c8 [diff]

Merge branch 'nr.dev' into 'ibm-trunk'

Nr.dev

Further fixes for customer-reported problems

See merge request !68

tree: 5275306562618db657c4c756769fa6fa766dcc19