Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 07:12:21 +0000 (15:12 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 07:12:21 +0000 (15:12 +0800)

Trivial merge