Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:15:25 +0000 (13:15 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:15:25 +0000 (13:15 +1000)

Trivial merge