eliminar archivo duplicado en rama
eliminar archivo incorrecto en la rama
WIP
Traduccir archivo etiquetas HTML
Merge branch 'master' into etiquetas_HTML

Conflicts:
	sites/es/frontend/hacer_columnas.step
introduce locale (as sites subdir and optional param), and...

* use Sinatra 1.3.6
* add short stack trace to error log
* various refactorings
* put Deck file server ahead of Sinatra in middleware chain (using Rack::Cascade)
use subdomain, param, or environment variable to specify locale
Update branch
Merge branch 'master' into osx-lion

* master: (183 commits)
  Add correct link
  Delete unnecessary file
  Remove extra content
  Remove extra blank line
  Rename file
  Fix translation
  Remove spanish method
  Fix translation
  Add missing accent
  Fix translation
  Add missing accent
  Fix translation
  Fix translation
  Add missing accents
  Fix translation
  Fix translation
  Remove file without extension
  Fix translation
  Fix translation according to PR comments
  Add missing file extension
  ...
OSX-RVM translation
TOC now works with locale
Archivo modificado etiquetas HTML
Eliminado archivo duplicado
[#58728698] gettin started translation
Merge master
Grammar corrections
Merge pull request #313 from alexch/locale

Locale
Merge branch 'master' into codificadas

Conflicts:
	app.rb
	spec/step_page_spec.rb
clean up syntax error messages
[#58728698] fix comments