Merge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 01:48:49 +0000 (11:48 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 01:48:49 +0000 (11:48 +1000)

Trivial merge