Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)

Trivial merge