Merge branch 'MDL-52825_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 10:25:54 +0000 (10:25 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:17 +0000 (10:15 +0800)
commit760b0a17f1e79ed542fc903e31780aebca286403
treeb7204e1a054b5db4360bea29937ea5568838b7b6
parent99e96d83b6259a8df327ca804a6a98088a043f00
parent923589d75926e83c5c1d592f068693109be3b6f3
Merge branch 'MDL-52825_master' of git://github.com/dmonllao/moodle