Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 14:08:59 +0000 (15:08 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 14:08:59 +0000 (15:08 +0100)

Trivial merge