chamilo/chamilo-lms — pull request #393 by aragonc (2014-10-22 01:56:10+00:00)
Title: C7339 c7304

only merge the last 5 commits please