annotate test/functional/.svn/prop-base/news_controller_test.rb.svn-base @ 724:b96d3005ee79 luisf

Merge from branch "live"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 21 Oct 2011 16:20:22 +0100
parents 513646585e45
children
rev   line source
Chris@0 1 K 13
Chris@0 2 svn:eol-style
Chris@0 3 V 6
Chris@0 4 native
Chris@0 5 END