Merge commit '98f0721b2f5a4cc243a051aac620a3cb3e849104' into svg-commitgraph-new master
authorStephan Maka <stephan@spaceboyz.net>
Thu, 21 May 2009 14:49:04 +0000 (16:49 +0200)
committerStephan Maka <stephan@spaceboyz.net>
Thu, 21 May 2009 14:49:04 +0000 (16:49 +0200)
commit0e0c76fa6e13a397f1b1def1051ecff35ea82a43
treed1f5a2a7c91ca8261a43858f87c9c56858c956bf
parent96d7086ae4d0640a0adb85a04cade53ee842c17a
parent98f0721b2f5a4cc243a051aac620a3cb3e849104
Merge commit '98f0721b2f5a4cc243a051aac620a3cb3e849104' into svg-commitgraph-new

Conflicts:
app/views/repositories/show.html.erb
lib/gitorious/graphs/branches_builder.rb
lib/gitorious/graphs/builder.rb
lib/gitorious/graphs/builder.rb