Merge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:29:00 +0000 (16:29 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:29:00 +0000 (16:29 +1000)

Trivial merge