Merge branch 'MDL-51578' of git://github.com/blaky/moodle
commit4d49a32f9e3ef2118c9912a8207f901f50a5b622
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:40:20 +0000 (6 11:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:35 +0000 (6 16:31 +0100)
tree30ad6bf7018ef561499fdf0c475c409720cc37e2
parent2af6345a6f90fc1c1a4a42490bdccb7804e1d74c
parent933f0d966e8291a212fdcfa39b7679a7a2166d1f
Merge branch 'MDL-51578' of git://github.com/blaky/moodle