Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 03:54:28 +0000 (11:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 03:54:28 +0000 (11:54 +0800)

Trivial merge