Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:21:46 +0000 (12:21 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:21:46 +0000 (12:21 +1000)

Trivial merge