Merge branch 'MDL-54116-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:36:01 +0000 (15:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:36:01 +0000 (15:36 +0800)
commit13d04ab6c1ef393b9974726994d86881c0dd58a1
treedc626924ceadbf93954c4cfcec77d7a8c9b50670
parent42d0093d6e0316a491959747ca712d9aafd76926
parentc0e3e9da3765e7782ef011305addb2b7ab355a32
Merge branch 'MDL-54116-master' of git://github.com/cameron1729/moodle