Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 08:47:38 +0000 (16:47 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 08:47:38 +0000 (16:47 +0800)

Trivial merge