Merge branch 'MDL-34539' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:23:57 +0000 (03:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:23:57 +0000 (03:23 +0200)

Trivial merge