chamilo/chamilo-lms — pull request #394 by ilosada (2014-10-22 14:31:00+00:00)
Title: 7212c

I had to create this new branch because 7212b was quite outdated.
When trying to merge with 1.9.x, it showed me too many new/modified file messages to commit and also conflicts.
7212c is a clean recent 1.9.x version merged with 7212b.
This gave me only a trad4all language file conflict which is already solved.