Merge branch 'MDL-51057-M30' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:53:21 +0000 (09:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:53:21 +0000 (09:53 +0800)
commit87aadca845a14557ef3463fece45ae49e95c540d
treeb365fbf7a3e1b13a31f1e5e560c10adee63a60c1
parent068f1fce33ad1c309fd27665ebd69a05a76aaf96
parent66cd0e69805766554c2c7a8ce63afb2bf77011b7
Merge branch 'MDL-51057-M30' of git://github.com/lazydaisy/moodle