Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle
commit18ebeed5e90168fcee29b23552733cfc197e188a
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:21:28 +0000 (23 15:21 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:21:28 +0000 (23 15:21 +0800)
tree1247f1535c0bb97ce373330d699479ab415ca01d
parentbcd015bea61388ceae872ab051de3b61be70c85e
parentbeb7456e3e841a6d5e199edf1c292345a3964702
Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle