Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 06:43:12 +0000 (16:43 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 06:43:12 +0000 (16:43 +1000)

Trivial merge