From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 09:39:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.3.0~189
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94793ed10acf996a4b3f9f1a8538a1b997436d9f;p=gitblit.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	releases.moxie
---

94793ed10acf996a4b3f9f1a8538a1b997436d9f