Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)
commit0568684bfde083aa7e1d37e95e3a9b1be8599f52
tree1d9266fb1a2af86be31ee18bee920014805c801d
parentcfeadc66b0a64f5b13b8bf6e6f9f46c37ab8b3c9
parent5e9a937bba9c4d17829e05f6648b0536260eccdc
Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle