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)
commit376ab5e457f3ee2362192166ed11bd278e502751
tree08bbc23500cf9463b9b0c60ad5f852d415f38627
parent748674085f0fc8e2c1f60cba840cd1d5ff454966
parentd13b0d46821a570c11cb723926886824edd83da2
Merge remote-tracking branch 'remotes/origin2/master'

Conflicts:
patch/gitweb.cgi.diff