Merge git://gitorious.org/gitorious/mainline
authorMarko Peltola <marko.peltola@jyu.fi>
Thu, 1 Apr 2010 11:03:12 +0000 (14:03 +0300)
committerMarko Peltola <marko.peltola@jyu.fi>
Thu, 1 Apr 2010 11:03:12 +0000 (14:03 +0300)
commit4bf4af5b919d791d958e5644f23f95ae245e6478
treef62e4d5bf1f4d3e7643500635f94a17d13dee876
parent8208b774a8c6c7fce4f568a5815c38c6621a0bba
parent0bb149ac99c9869e88426c1c2dd8089ec55a5a4a
Merge git://gitorious.org/gitorious/mainline

Conflicts:
app/processors/push_event_processor.rb
db/schema.rb

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>
app/models/repository.rb
app/processors/push_event_processor.rb
db/schema.rb