Merge branch 'MDL-40180_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 02:42:33 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 02:42:33 +0000 (10:42 +0800)

Trivial merge