Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:54:51 +0000 (10:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:54:51 +0000 (10:54 +0800)
commit1b5c5e578854e6c4df8fc38210e86b5d8e9441d6
treef251e9d72473979696bbb7bb2492d3eeb87dc1f7
parent51feee1f6468ef181c1bd58f2f3394950c7e9b7c
parent3330e653545db4bff0083db0b3936df672842be5
Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle