Merge branch 'MDL-49696-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 07:42:11 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 07:42:11 +0000 (15:42 +0800)
commit58aa74522d24f5bbc67fe3141acf65fb51338aa0
tree53dc1cdb8b345d5a0b985272301ea8a76be83903
parent4451f89b073f17009f86cbb9901ef8296f753797
parent649acb9833b9a2e68bda2db0ff36be599669950d
Merge branch 'MDL-49696-master' of git://github.com/andrewnicols/moodle