seancolyer ba8a964d05 Merge branch 'pr/95'. Had to manually build make because previously
merged pr96.

Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
2013-08-25 19:11:12 -04:00
..
2012-01-16 02:06:09 +01:00
2013-02-20 15:56:27 +01:00
2013-02-20 15:56:27 +01:00
2013-01-10 18:31:23 +01:00
2012-01-16 02:05:48 +01:00
2011-11-13 11:50:49 +01:00

Add other resources here (e.g. buildbot master scipt)