Merge branch 'MDL-46927_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 08:03:43 +0000 (09:03 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 08:03:43 +0000 (09:03 +0100)
commit554dedf6a6d86a00002ed966d8e83696c0e196eb
tree006ce92642dc84104d6936e5fdb631fab2480044
parentf0fa70d0df1955816c5cccfb3e35bbc8aa4a01b2
parent94f78b0d15cccfd629e4a1e2bcd8d52ae530ed5f
Merge branch 'MDL-46927_master' of git://github.com/markn86/moodle