From 94793ed10acf996a4b3f9f1a8538a1b997436d9f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:39:31 -0400
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

---
 releases.moxie |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 59f3ba2..78d533f 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
 	 - Added more error checking to blob page and blame page
 	 - Disable SNI extensions for client SSL connections
+	 - Use bash instead of sh in Linux/OSX shell scripts (issue 154)
 	 - Fix NPE when getting user's fork without repository list caching (issue 182)
 	 - Fix internal error on folder history links (issue 192)
 	 - Fixed incorrect icon file name for .doc files (issue 200)
@@ -56,6 +57,7 @@
 	- Philip Boutros
 	- Rafael Cavazin
 	- Ryan Schneider
+	- Sakurai Youhei
 	- Sarah Haselbauer
 	- Slawomir Bochenski
 	- Stardrad Yin

--
Gitblit v1.9.1