Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 06:32:16 +0000 (16:32 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 06:32:16 +0000 (16:32 +1000)

Trivial merge