Merge branch 'MDL-46792-master' of git://github.com/xow/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 04:10:13 +0000 (12:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 04:10:13 +0000 (12:10 +0800)
commitf01330f6ca6847bb022f7d998c5d699d0909182f
tree5bc0f7f1fb5d45461d266a264d275ddbd1ef7ca8
parent617dbe49edde2cf9c1aa10c64868d7e7bfaca8d3
parent248e23c3358426c55f97856ca52cb9356c5a4ac2
Merge branch 'MDL-46792-master' of git://github.com/xow/moodle