Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 24 Oct 2013 03:15:05 +0000 (14:15 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 24 Oct 2013 03:15:05 +0000 (14:15 +1100)

Trivial merge