Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2013 13:49:33 +0000 (15:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2013 13:49:33 +0000 (15:49 +0200)

Trivial merge