Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)

Trivial merge