Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 02:39:16 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 02:39:16 +0000 (10:39 +0800)
commit91b24de2e5714a41707f1e15114fda5bb18e3679
treee225f7a8d32a72151beedd7e94887dc05f091ee6
parentc14cad3167dfb4813f20c009836ed63a093ee05c
parent3f7b501e66cbdefb50ce1aa9e1eea4e650e725db
Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle