Code

merge with work#12

Code

Merged

pedropaG merged 5 commits intomasterpedropaG/gem:masterfrom workpedropaG/gem:workCopy head branch name to clipboardMar 19, 2013

+112-112

Commits

Commits on Mar 16, 2013

• Update Cities.sql

  Show description for 379d9bc
  pedropaG

  committed
  379d9bc

  Copy full SHA for 379d9bc

• 'Happiness' lines translated

  pedropaG

  committed
  32f316d

  Copy full SHA for 32f316d

Commits on Mar 18, 2013

• Second Half of 'others' lines

  pedropaG

  committed
  2dc36fc

  Copy full SHA for 2dc36fc

Commits on Mar 19, 2013

• 'others' lines finished. Change Languaje BD to ES_ES

  pedropaG

  committed
  dfb6f77

  Copy full SHA for dfb6f77

• 'others' lines finished. Change Languaje BD to ES_ES

  pedropaG

  committed
  b7102f0

  Copy full SHA for b7102f0