Merge branch 'MDL-42230' of git://github.com/timhunt/moodle
commit38a5cc79f8ccfd13b46f4b538629eaa183244d10
authorMarina Glancy <marina@moodle.com>
Tue, 15 Oct 2013 02:19:20 +0000 (15 13:19 +1100)
committerMarina Glancy <marina@moodle.com>
Tue, 15 Oct 2013 02:19:20 +0000 (15 13:19 +1100)
treeaf6b772f754d21c774e6cc872bc7c5080e05338a
parentbd81762784a3b5147b64a0cb9e5a8c56bd8c101f
parentd3603928a90accac2cfd8f0dbd4833b9280a48c3
Merge branch 'MDL-42230' of git://github.com/timhunt/moodle