From 55cecdbb6c961441330c928f9ed587582f317f4b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 07 Oct 2011 21:11:55 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 docs/04_design.mkd |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/docs/04_design.mkd b/docs/04_design.mkd
index 70cea7c..fe22674 100644
--- a/docs/04_design.mkd
+++ b/docs/04_design.mkd
@@ -10,6 +10,7 @@
 ### Bundled Dependencies
 The following dependencies are bundled with Gitblit.
 
+- [Bootstrap](http://twitter.github.com/bootstrap) (Apache 2.0)
 - [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0)
 - [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0)
 - magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY)
@@ -39,6 +40,7 @@
 - [JUnit](http://junit.org) (Common Public License)
 - [commons-net](http://commons.apache.org/net) (Apache 2.0)
 - [ant-googlecode](http://code.google.com/p/ant-googlecode) (New BSD)
+- [GenJar](http://genjar.sourceforge.net) (Apache 1.1)
 
 ## Building from Source
 [Eclipse](http://eclipse.org) is recommended for development as the project settings are preconfigured.

--
Gitblit v1.9.1