Merging from trunk

[inkscape.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index f9cbc2f9250872db4845d8f58fa89d49a14c5230..724ec295ecbda51fa8163ca61dd24c2d5b31b55d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Bill Baxter
 John Bintz
 Arpad Biro
 Nicholas Bishop
+Joshua L. Blocher
 Boldewyn
 Daniel Borgmann
 Bastien Bouclet