Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 07:20:47 +0000 (15:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 07:20:47 +0000 (15:20 +0800)
commit48645e475bf932ba1bc1b9ad30b926f610dfebbc
tree9eb047907ec7950966c482d31ffe70b1ca010a1f
parentce16ceb6673ffe47124417842ac717f7deb85bad
parentaac6717056dc11d9d8edd7d2413363b9fdb96ba1
Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle