Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 03:44:42 +0000 (11:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 03:44:42 +0000 (11:44 +0800)
commit95664d548f510fa3e53d0578fdab122cfdf1969d
tree9804cdac8dd346963b011ac2e5564d4a69786fea
parent44a0b1e700f39dd2d7a7fccc10165e8a21e62a6d
parent325f668670ff72908feea189beb7e13c5e5ed7c1
Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle