Merge branch 'MDL-50091' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 11:06:49 +0000 (12:06 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 11:06:49 +0000 (12:06 +0100)
commitbf6395107bd8ac61f8d05d261e226109bdc454a5
treefaec1fe0b25a4f4029fe865231b45580c1928093
parent15e6543a5fd9749ac4040b7fdc59f955ea500980
parent2ebeeeaf0a4982c9e1704b7475e461409222c15f
Merge branch 'MDL-50091' of git://github.com/timhunt/moodle