Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 07:36:07 +0000 (15:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 07:36:07 +0000 (15:36 +0800)

Trivial merge