3 Commits

Author	SHA1	Message	Date
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +01:00
James Booth	78a4446023	Merge branch 'master' into stabber-tests	2015-06-02 20:32:15 +01:00
James Booth	6d6bb64588	Moved tests -> unittests	2015-05-28 18:50:55 +01:00