Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:20:05 +0000 (14:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:20:05 +0000 (14:20 +0800)

Trivial merge