Merge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 12:29:10 +0000 (13:29 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 12:29:10 +0000 (13:29 +0100)
commit0c689b02fbf40d03bc34bf91c14c4bfe51b69671
tree01d1ab8d32f773871d1c4ee765c054dc2c7f8bfb
parentbf6395107bd8ac61f8d05d261e226109bdc454a5
parent3078b980f59621899430e07dc393499f5e54f336
Merge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle