From: Jamie McClelland <jm@mayfirst.org>
Date: Mon, 28 Jul 2008 01:35:08 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.5-1~5
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4b5f730b70649fa0b8e7b061a2e232c77176cbf6;hp=b37c81f6a77fff9e4d1bfe1a0322acb3e4950cd3;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/website/favicon.ico b/website/favicon.ico
new file mode 100644
index 0000000..dc30bcc
Binary files /dev/null and b/website/favicon.ico differ