Merge branch 'MDL-41313-master' of git://github.com/andrewnicols/moodle
commit3d9ea145c281df7b6c5f8a826db7a7487cda0c6d
authorMarina Glancy <marina@moodle.com>
Tue, 3 Jun 2014 09:32:36 +0000 (3 17:32 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 3 Jun 2014 09:32:36 +0000 (3 17:32 +0800)
treed18b2dbc754e9953173531d548ed7feeabcaee2e
parentd47bd7962b14526bee2917c9106115f1a677bbbf
parent6add5fb752660a4ae15783dbb29b80f0ea3e576d
Merge branch 'MDL-41313-master' of git://github.com/andrewnicols/moodle