ar injection on 20130910-050319
pt-BR injection on 20130910-050319
pt-BR injection on 20130911-050432
pt-BR injection on 20130912-050343
es-ES injection on 20130911-050432, 20130912-050343 (reformatted)

Conflicts:

	answer/webapp/src/main/resources/locale/portlet/answer/AnswersPortlet_es_ES.properties
	forum/webapp/src/main/resources/locale/portlet/forum/ForumPortlet_es_ES.properties
	poll/webapp/src/main/resources/locale/portlet/poll/PollPortlet_es_ES.properties
ar injection on 20130912-050343 - reformat ForumPortlet_ar.properties

Conflicts:

	forum/webapp/src/main/resources/locale/portlet/forum/ForumPortlet_ar.properties
tr injection on 20130913-051911
vi injection on 20130913-052948
pt-BR injection on 20130913-052948
Merge commit 'ba656a23d7bfa77fb6885f3f50de173ceb1acc5c' into HEAD