Merge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:24:53 +0000 (22:24 +0100)
committerChristian Johansen <christian@shortcut.no>
Sat, 12 Feb 2011 21:24:53 +0000 (22:24 +0100)
commit0fe6f0e9832a589e659770b6237a97a8f29f6236
tree626d78288cc80083e07577e7db72641d46b84c15
parent84232dfda48cf73524cdb5d10d5bfb7e4d468175
parent7cca4e7439a68f639cd1f583faefd7dd3aca9cdc
Merge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline into merge-requests/133
app/helpers/event_rendering_helper.rb