Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)
commit252bd39983efe8994f98302ecbe9f53e9ebca139
tree88c0bd1ff5a4b09b413aa0cc2317bb47defe7a57
parentba2f9a96955102e5f316e8450c0e89b406f4c55b
parentab7fa5569454439b4fb84c02dacb83807dfb5df0
Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle