From: Joey Hess <joey@kitenet.net>
Date: Thu, 26 Apr 2012 16:54:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120516~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a29599d68aec2797eb6b3b48c8a151025a4d6fa4?hp=75edc3c2233461ad371710c05497e6c7e1e79a46

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 777366291..e3e6491ff 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -80,6 +80,7 @@ Projects & Organizations
 * [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/)
 * [Arcada Project](http://arcadaproject.org/)
 * [*BSD UNIX user group in Denmark](http://www.bsd-dk.dk/)
+* [Telecomix Broadcast System](http://broadcast.telecomix.org/)
 
 Personal sites and blogs
 ========================