Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 06:44:08 +0000 (14:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 06:44:08 +0000 (14:44 +0800)
commitcf63799155239fd91bedfd19184e267cce5596fc
tree7b6a87658fa1aca730e604c78e788c7dbdf6f51a
parent857c7b4986dcaf73d98ecfb0adec07614cf656df
parent912296ad30729e8c2540abda29b2d53c5a463ae8
Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle