Correct trailing slash redirection in htaccess
Restored changes from mis-merge with master
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Correct issue with pin titles when Google Feed API returns an encoded string
Merge branch 'master' into deploy
Merge branch 'deploy' of ssh://github.com/dehrgg/feed