Merge branch 'MDL-34985_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:07:45 +0000 (20:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:07:45 +0000 (20:07 +0200)

Trivial merge