Merge branch 'MDL-38861' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 4 Apr 2013 03:00:01 +0000 (11:00 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Apr 2013 03:00:01 +0000 (11:00 +0800)

Trivial merge