Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 17:17:17 +0000 (18:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 17:17:17 +0000 (18:17 +0100)

Trivial merge