Merge remote-tracking branch 'remotes/origin2/master'
authorStricted <Stricted@nexus-irc.de>
Fri, 7 Sep 2012 20:19:31 +0000 (22:19 +0200)
committerStricted <Stricted@nexus-irc.de>
Fri, 7 Sep 2012 20:19:31 +0000 (22:19 +0200)
Conflicts:
patch/gitweb.cgi.diff


Trivial merge