From: Stricted <Stricted@nexus-irc.de>
Date: Fri, 7 Sep 2012 20:19:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin2/master'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=376ab5e457f3ee2362192166ed11bd278e502751;p=gitweb.git

Merge remote-tracking branch 'remotes/origin2/master'

Conflicts:
	patch/gitweb.cgi.diff
---

376ab5e457f3ee2362192166ed11bd278e502751