Merge branch 'hotfix/ruby-1.9.2-hashify_domains-bug'
Merge branch 'master' of https://github.com/flogic/whiskey_disk into develop