Merge branch 'remove-commit-events'
authorChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:42:22 +0000 (13:42 +0100)
committerChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:42:22 +0000 (13:42 +0100)
commit2fe00aa0743386f633b7578d1069d69184a6414e
tree3a693b8cdb68ffe3f46a4536e87c794b08490963
parentad67ea9cf071460364976521b694263b2da9ccdd
parent686ee51992f1bae5e01dd636541c6d0b22c7cc43
Merge branch 'remove-commit-events'
app/controllers/merge_requests_controller.rb
app/helpers/event_rendering_helper.rb