Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:41:13 +0000 (12:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:41:13 +0000 (12:41 +0800)
commitaa452f97e37175d355f300c29bebb40f19be5d08
treee0e7c5a0b3326a02b6f589afa0d2cb64b3cde429
parent97f236e747f03b1d9b8924b16a536023f77c39da
parenta0dc7da9b4e249d19acbb6399c47d56134e0b03f
Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle