Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)
commita9a09787e47a9ac4edd0d28e85dd5c6d53467b45
treeb68c08c8ace5e6ffa6846113b53f099afda50196
parent71668d2efcdea4d6f963d61ec797f6974de1566a
parentf4f2045a7f7a8cca17da7e1660684dce54d6c454
Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle