Merge branch 'master' of git://gitorious.org/gitorious/mainline
authorBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Tue, 27 Nov 2012 18:27:36 +0000 (10:27 -0800)
committerBrian E Clow (squee.slo-off.sptron.com) <bclow@shopatron.com>
Tue, 27 Nov 2012 18:27:36 +0000 (10:27 -0800)
commit75af3ace50c90e899b4b54316f227dea44a95665
treedca970168d2963e70bdc7a0fd214441afc3966e6
parent8b723dacd3a9bcb695ce161a9520a65bc4e65d17
parentb50c6c39742195bf9329df25c2540f2435f7071e
Merge branch 'master' of git://gitorious.org/gitorious/mainline
test/functional/projects_controller_test.rb