Merge branch 'master' into rpc

diff --cc docs/00_index.mkd
index 489f84a1fc90c69dce7137867f38a6f831767c50,17ca428e1aa0a1c27eccba713ed3c491ac0fb136..079bc3d3d11e7c0c7f9d231ed7990ad054d5f37a
--- 1/docs/00_index.mkd
--- 2/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@@ -27,16 -26,11 +27,17 @@@ Gitblit requires a Java 6 Runtime Envir
  \r
  ### Current Release\r
  \r
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
  \r
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit\r
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit\r
  <br/>**New:** *web.loginMessage = gitblit*\r
 +- added: authenticated JSON RPC mechanism \r
 +<br/>**New:** *web.enableRpcServlet = true*\r
 +<br/>**New:** *web.enableRpcAdministration = false*\r
 +- added: reusable JSON RPC client class\r
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.\r
 +- 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.\r
+ - fixed: Set the RSS content type for Firefox 4 (issue 22)\r
  - fixed: Null pointer exception if did not set federation strategy (issue 20)\r
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r
  - added: IUserService.setup(IStoredSettings) for custom user service implementations\r
@@@ -51,4 -45,4 +52,4 @@@ Gitblit is distributed under the terms 
  [git]: http://git-scm.com "Official Git Site"\r
  [gitbltsrc]: http://github.com/gitblit "gitblit git repository"\r
  [googlecode]: http://code.google.com/p/gitblit "gitblit project management"\r
--[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"
++[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"

diff --cc docs/04_releases.mkd
index 43168dd203a3b539fafc2f8428e7a796b1aa99c3,01b531d652f469d51cfb0253fe228b79078253d9..10ef2bb9ba4f922bbf420f36f6f5828597fd81ee
--- 1/docs/04_releases.mkd
--- 2/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@@ -1,16 -1,11 +1,17 @@@
  ## Release History\r
  \r
  ### Current Release\r
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
  \r
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit\r
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit\r
  <br/>**New:** *web.loginMessage = gitblit*\r
 -- fixed: Set the RSS content type for Firefox 4 (issue 22)\r
 +- added: authenticated JSON RPC mechanism \r
 +<br/>**New:** *web.enableRpcServlet = true*\r
 +<br/>**New:** *web.enableRpcAdministration = false*\r
 +- added: reusable JSON RPC client class\r
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.\r
 +- 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.\r
++- fixed: Set the RSS content type for Firefox 4 (issue 22)
  - fixed: Null pointer exception if did not set federation strategy (issue 20)\r
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r
  - added: IUserService.setup(IStoredSettings) for custom user service implementations\r
@@@ -60,4 -55,4 +61,4 @@@
  \r
  - initial release\r
  \r
--[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
++[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"