Merge remote-tracking branch 'remotes/origin2/master'
authorStricted <Stricted@nexus-irc.de>
Fri, 7 Sep 2012 18:41:28 +0000 (20:41 +0200)
committerStricted <Stricted@nexus-irc.de>
Fri, 7 Sep 2012 18:41:28 +0000 (20:41 +0200)
commita33f8c96495ac8d74b1a93c8964386653034a25f
tree874d2743f7165479ab9c44b6b7f0f9bd5fc7b12d
parent8a1b4b56d79bc614cbaae6fd47a27b8b256fff8a
parentee7f986fc9fa02f5465b002f83390ce1cd93456e
Merge remote-tracking branch 'remotes/origin2/master'

Conflicts:
git_graph.php
git_graph.php