backmerge 'development' into release/v0.4.0

torbjoernk · torbjoernk · commit 3b9ca605f154 · 2015-04-14T16:08:57.000+02:00
* development:
  Add Matt's key.

Signed-off-by: Torbjörn Klatt &lt;t.klatt@fz-juelich.de&gt;
diff --git a/README.md b/README.md
@@ -71,6 +71,9 @@ Release tags will be signed by one of the following PGP keys:
     0xAD9F8DC6 2014-12-12 Torbjörn Klatt <t.klatt@fz-juelich.de>
     Fingerprint 6277 E9D9 7AA2 DBBE 5DE7 7498 756B F4D7 AD9F 8DC6
 
+    1024D/9950EF2E 2001-11-22 Matthew Emmett <matt@emmett.ca>
+    Fingerprint B09C 1425 1C47 B58E B3AC 2E74 6F22 8460 9950 EF2E
+
 
 Build status
 ------------

-Original file line number
+Diff line change
 xAD9F8DC6 2014-12-12 Torbjörn Klatt <[email protected]>
     Fingerprint 6277 E9D9 7AA2 DBBE 5DE7 7498 756B F4D7 AD9F 8DC6
 +    1024D/9950EF2E 2001-11-22 Matthew Emmett <[email protected]>
 +    Fingerprint B09C 1425 1C47 B58E B3AC 2E74 6F22 8460 9950 EF2E
++
 Build status
 ------------