Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)

Trivial merge