Merge branch 'master' of git://github.com/ujifgc/swift
Merge branch 'master' of git://github.com/ujifgc/swift
fix image-test
fix view.rb on pagecontent and fix pagecontent test
Merge branch 'master' of git://github.com/core-attack/swift
use :test as rack env in tests