Merge branch 'MDL-47711' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:28:50 +0000 (17:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:28:50 +0000 (17:28 +0100)
commit6366cc0774fd98affc54bb46b66b55a283e2d502
treeb5993a0bf549fea9c9bf2507967505aaf898ce91
parent30fac845783b0e0a54dbeb0716237ff4ec4ac373
parentd69a6ad965edea5d1a035f6752822ab292ff2d7d
Merge branch 'MDL-47711' of git://github.com/timhunt/moodle