en injection on 20130919-050411
fr injection on 20130919-050411
ar injection on 20130919-050411
ja injection on 20130919-050411
de injection on 20130919-050411
vi injection on 20130919-050411
sv-SE injection on 20130919-050411
it injection on 20130919-050411
pt-BR injection on 20130919-050411
es-ES injection on 20130919-050411
ru injection on 20130919-050411
tr injection on 20130919-050411
es-ES injection on 20130914-050322

Conflicts:

	calendar-webapp/src/main/resources/locale/portlet/calendar/CalendarPortlet_es_ES.properties
tr injection on 20130914-050322
pt-BR injection on 20130915-050515
tr injection on 20130915-050515
vi injection on 20130916-050313
Merge branch 'stable/4.0.x' into feature/4.0.x-translation
fr injection on 20130920-050651
ar injection on 20130920-050651