Merge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 06:03:42 +0000 (14:03 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 06:03:42 +0000 (14:03 +0800)

Trivial merge