Merge branch 'master' of git://gitorious.org/gitorious/mainline
authorBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Thu, 14 Feb 2013 19:07:15 +0000 (11:07 -0800)
committerBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Thu, 14 Feb 2013 19:07:15 +0000 (11:07 -0800)
commit3eb3fde81a6db6fed9e7f489bbf0562192e569b1
treec0e26f1d86f5cb9fb9e1d92383c0849294f24c29
parente05921d89060726d9924e4883e820e01c2387c5b
parentdd55d1af3767ef0176c07c5f19866e65ce25cb62
Merge branch 'master' of git://gitorious.org/gitorious/mainline
test/functional/projects_controller_test.rb