Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 02:59:31 +0000 (10:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 02:59:31 +0000 (10:59 +0800)

Trivial merge