Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 04:48:10 +0000 (14:48 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 04:48:10 +0000 (14:48 +1000)

Trivial merge