Merge branch 'MDL-47536' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)
commitaeb47dd84a33707b7171af6ca032afc7216ee59a
treefad50d8bad22a348b97a07667d060fab52549c56
parentd55b326cbcb0a67b2987c918267c16466758fc11
parent37c99c32376c4e1033c90630e20e1eda42ab949b
Merge branch 'MDL-47536' of git://github.com/stronk7/moodle