Merge branch '40693-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)
commite41761a5e9953abd23d7297dd65ffdf85bebec49
treedfd151590f8fb9bd72586f0af99e73e8bb90f500
parentfb9360db3aaa0759953ab5250b9c48f553ab18d7
parent73fc183d3af5d9c51b2b3bc336b48c4ae4453828
Merge branch '40693-27' of git://github.com/samhemelryk/moodle