Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 16:15:01 +0000 (17:15 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:12 +0000 (09:04 +0100)
commit7d78a2eee2564443e897624375e397e2165da93b
treed3589e93046b92fb8a59968f75a91aecb26bafa6
parentd7c9327d4891fccbda5d1e710fb8be115b4b52fa
parent5b40141f6dd03b265f5bab8ad5ced791495339d7
Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle