open-keychain/open-keychain — pull request #708 by artbristol (2014-07-06 14:26:07+00:00)
Title: Prefer composition to inheritance

minor tidying...