Merge branch 'MDL-51131-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 06:07:49 +0000 (14:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 06:07:49 +0000 (14:07 +0800)
commitd0efe9a080ab5930312ae6bd7a0666ccb4b32225
tree7c421e94be6e5956c4f6880360187eb981e85dc1
parent5d98022e81f13c79f15813b813ebc3ecf742bee5
parent2aaed97f6107609519c904d9a28a1e3827c648b1
Merge branch 'MDL-51131-master' of git://github.com/marinaglancy/moodle