Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)
commit2fdb4c6b0095e74e4309f7a0ea6211fd9410ac8f
treea460a260d7b24bcca4c419d1323793bb1b5795c7
parentedfeca582ec7387821ca95f7b9b493f3cb46d99c
parentf656df787fe902e103745ec398f54b6201b910ec
Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle