Merged updates from trunk into stable branch
authorNeil Smith <neil.git@njae.me.uk>
Wed, 22 Jul 2009 13:37:05 +0000 (13:37 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Wed, 22 Jul 2009 13:37:05 +0000 (13:37 +0000)
commit3a164c47cd4f58ff8ee59446c73970d1b9b3fbbf
tree470ffa8d20fc2d12d56c8d62854c05e0f967f423
parentd790a8da6d9f6b3d07c62cf9cabc1abcf8ed09c2
Merged updates from trunk into stable branch
app/views/feed/index.html.erb
public/favicon.ico