Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle
commit7c433fa526b09b17176c041b73c65c9b1820e9d9
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:26:32 +0000 (4 10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:26:32 +0000 (4 10:26 +0800)
treee7aa5849c0840683c8bffcc2a2ec93935d4f089e
parente9c0ef3bcacf62165b970a0767bb5198d0d08d83
parent2324cf045e5125e29c0798d0cd975e97f7e7d023
Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle