Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:01:37 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:01:37 +0000 (15:01 +0800)
commit7363aacb651795e132e401d4cff3472ac0d131d7
treee6a4feaca7be5ab4fa542543a66e2b06f355799f
parent6bc8b35add622f0fcfe4ec7af3c150b8b59f9bed
parent02d1a0a5756fdcbcea4072a0b07cf4e7a8e5c0a7
Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle