Merge branch 'MDL-50834' of https://github.com/danielneis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 12:25:57 +0000 (13:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 12:25:57 +0000 (13:25 +0100)
commit8b5668525386180931de1ed17bf6c65a6a9682da
tree8a0f3c36f8c56e364a48c368c7a23273a724107a
parent4cb1a61f815022cd63537bfd6c237cb3107a8708
parent9de0c8308694b99ccd2b5f154bbb7671472e7be8
Merge branch 'MDL-50834' of https://github.com/danielneis/moodle