Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:58:27 +0000 (08:58 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:58:27 +0000 (08:58 +0000)
commit4c37593dcd26ccce14291ab1aee8de8509b16ed7
tree84fa3a77d683b0ff9e00d23adcd2ef4724b58a22
parent4aeebe34b4b1389ac4a4f2228c2e006075647599
parentb7ee86966b95006ef9920fe8a14265001dbf5fb5
Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle