Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 03:07:53 +0000 (11:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 03:07:53 +0000 (11:07 +0800)

Trivial merge