Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 05:08:10 +0000 (13:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 05:08:10 +0000 (13:08 +0800)

Trivial merge