Merge remote-tracking branch 'marco/spanish'
authorFelipe Raimann <felipeacsi@gmail.com>
Sat, 2 Feb 2013 15:19:55 +0000 (12:19 -0300)
committerFelipe Raimann <felipeacsi@gmail.com>
Sat, 2 Feb 2013 15:19:55 +0000 (12:19 -0300)
commit3bb50f9b8025f3443bf015793dff3a87330fc1ce
tree10fc6cf04ec753b25f9fecdbfc8e0b1267ea3519
parent6153a01b7e6f9c6d9ce2c5877d8d71bc05096ba8
parente362e0819d3eb26f642c316ce96fdd7362524cd3
Merge remote-tracking branch 'marco/spanish'