Merge branch 'MDL-41402_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 08:27:46 +0000 (16:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 08:27:46 +0000 (16:27 +0800)

Trivial merge