Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 06:32:51 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 06:32:51 +0000 (14:32 +0800)

Trivial merge