2 Commits

Author	SHA1	Message	Date
Thomas Oberndörfer	5fd4bdbccb	Fix make bundle-test and keyring unit-tests	2013-12-09 16:57:44 +01:00
seancolyer	77974db1a6	Merge branch 'refactor'. Also marking resources/openpgp*.js files as ... binary to make some merge/diffing easier. Conflicts: resources/openpgp.js resources/openpgp.min.js	2013-01-14 20:44:58 -05:00