Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 09:14:48 +0000 (09:14 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 09:14:48 +0000 (09:14 +0000)
commite323635e1bb0d6c0b80af88bf500fcf31156a374
treedc6a1f9c5f0d2fa36431a5bf7156437ab0def249
parent4c37593dcd26ccce14291ab1aee8de8509b16ed7
parent2b0a7419c6fd3ba725a6c3a386fdd62925e6a6fd
Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle