Added body header hook
fixing issue with mirroring yet again
Merge branch 'master' of github.com:comfy/comfortable-mexican-sofa
Merge pull request #254 from JackNeto/master

Body header hook
fixtures are loaded based on the site identifier, not hostname
changing build image
Version bump to 1.6.26
Regenerate gemspec for version 1.6.26
File model tried to call instance on a symbol (Paperclip 3.4?)
Merge pull request #259 from ericboehs/instance_me_no_more

File model tried to call instance on a symbol (Paperclip 3.4?)
Add Ruby2.0.0 build in Travis-ci, and allowed to fail

http://about.travis-ci.org/docs/user/build-configuration/#Rows-That-are-Allowed-To-Fail
Be valid .travis.yml
set text_limit also for cms_blocks content
Merge pull request #261 from GarPit/master

Make "content" of Cms::Block larger than "text"
Merge pull request #260 from sanemat/feature/ruby-2-0-0

Add Ruby2.0.0 build in Travis-ci, and allowed to fail