Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 6 Aug 2013 12:33:55 +0000 (22:33 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 6 Aug 2013 12:33:55 +0000 (22:33 +1000)

Trivial merge