Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:52:55 +0000 (11:52 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:52:55 +0000 (11:52 +0800)
commitbfcbbc9833f7055c62e020cb45627e13373e98d6
treeb7f935dd810ed0b2cc8e00ec2570adce8c933975
parent00a9fa5d9afb4a06863a5f887a471b76775d9300
parente9904e0988f104f7dffb80073c9e7c1ff67a4212
Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle