Merge branch 'MDL-38999' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:35:40 +0000 (10:35 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:35:40 +0000 (10:35 +0800)

Trivial merge