Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 23:11:13 +0000 (01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 23:11:13 +0000 (01:11 +0200)

Trivial merge