Merging changes from trunk into stable branch
authorNeil Smith <neil.git@njae.me.uk>
Mon, 27 Jul 2009 13:19:54 +0000 (13:19 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Mon, 27 Jul 2009 13:19:54 +0000 (13:19 +0000)
commit9afca4a2a5790ed8842a7e5f0a3a3c716d28bb24
tree6cba9d5df706a1b5a3dd86227e89d8b0e2f44dbe
parenta5e58d33eef0f98067c18fba842fc5a3539d1c9a
Merging changes from trunk into stable branch
app/controllers/feed_controller.rb
app/models/feed_item.rb