Merge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:56:21 +0000 (13:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:56:21 +0000 (13:56 +0800)
commit7eebac6c77c1a3db2120ef778aa92526e750802f
treecddcbddfe9a04094649059dac7860e8a9ab3ff34
parent72647f09f100cbb446a6fb3ce6abd569547326e0
parent41058f0a19ec08f40c11efcc627969e31df0355c
Merge branch 'MDL-36860-master' of git://github.com/FMCorz/moodle