Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 05:43:53 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 05:43:53 +0000 (13:43 +0800)
commit17ac1b534966d203ca5fe55a191ada98b049007a
treeae2130613eb1c0535529b6a1845a24d2257861d7
parentd96a4e2a596c09511e9eba813a82628618f0c367
parent0e8ce68a179e6ff7f84b2af036b169ba309fcba5
Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle