Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 01:08:27 +0000 (11:08 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 01:08:27 +0000 (11:08 +1000)

Trivial merge