Merge branch 'MDL-49497' of git://github.com/stronk7/moodle
commitb32ba584b2939d880c0bc9519317ae49990b566f
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 15:25:04 +0000 (23 16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 15:25:04 +0000 (23 16:25 +0100)
tree59cd0550eb1e76bb36a6e3e302d6bfa2ce91b8b2
parent6d59f639141c4e7adb66e7324d8fc3aa95c28de7
parent9a1adda5850338b90a9884746580b2aa134fc46d
Merge branch 'MDL-49497' of git://github.com/stronk7/moodle