Merge commit 'leethal/master'
authorJohan Sørensen <johan@johansorensen.com>
Sun, 24 Feb 2008 23:13:06 +0000 (00:13 +0100)
committerJohan Sørensen <johan@johansorensen.com>
Sun, 24 Feb 2008 23:13:06 +0000 (00:13 +0100)
commit1e3418c3c19d04addde7c7ad29aea57096f0a857
tree95a17e375c044a845775dab5ab16aeed0ebf8048
parent3bf4c3fb4f3fda33065290cfc3504b221af9ec3c
parent544ea026e47443031ce58fa37be73350076de378
Merge commit 'leethal/master'

Conflicts:

app/helpers/application_helper.rb
app/helpers/application_helper.rb