From d478d139b400af66f3bb97f6cceb30a2ed77def8 Mon Sep 17 00:00:00 2001
From: workshed64 <stupiddaddy@gmail.com>
Date: Wed, 22 Jun 2011 20:43:18 -0400
Subject: [PATCH] changelog: added eris maintainers

Change-Id: I2ed16cd28b84aaebeea101aaa4597034eee7e0a2
---
 CHANGELOG.mkdn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 80568775..1e22bfd6 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -15,6 +15,7 @@ Maintainers:
 * Nexus S: Koush
 * Droid: cvpcs, mtwebster, Koush
 * Dream/Sapphire: Sileht, Wes Garner, Cyanogen
+* Eris: Workshed, Conap
 * Hero: Esa Laukkanen (GSM), Darchstar (CDMA)
 * Desire (GSM/CDMA): Kali-, Defer
 * Incredible: jistone, slayher, Koush