From 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 11 Oct 2008 11:16:23 -0400
Subject: Merging from trunk

(bzr r6884)
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index f9cbc2f92..724ec295e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Bill Baxter
 John Bintz
 Arpad Biro
 Nicholas Bishop
+Joshua L. Blocher
 Boldewyn
 Daniel Borgmann
 Bastien Bouclet
-- 
cgit v1.2.3