Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 09:16:43 +0000 (19:16 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 09:16:43 +0000 (19:16 +1000)

Trivial merge