Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)
commit71900d9202b9315c958c8326725b74e4b096454b
treef37aac68d075d98ac600c2e29aa99bd313ed94ed
parente6b00f032dc5ad497159e57b0ece991b9ff614b7
parent262abe63fde7304061ae826165cf0eecf5f9171d
Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle