From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 docs/00_index.mkd |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 489f84a..079bc3d 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -37,6 +37,7 @@
 - added: reusable JSON RPC client class
 - added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.
 - fixed/broke: federation protocol.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  This breaks 0.6.0 federation clients/servers.
+- fixed: Set the RSS content type for Firefox 4 (issue 22)
 - fixed: Null pointer exception if did not set federation strategy (issue 20)
 - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later
 - added: IUserService.setup(IStoredSettings) for custom user service implementations
@@ -51,4 +52,4 @@
 [git]: http://git-scm.com "Official Git Site"
 [gitbltsrc]: http://github.com/gitblit "gitblit git repository"
 [googlecode]: http://code.google.com/p/gitblit "gitblit project management"
-[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"
\ No newline at end of file
+[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"

--
Gitblit v1.9.1