Merge branch 'MDL-22153' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)
commitbf11c1d128d447ae3ab94d98517150da8e6fa7ee
treeb1dca69874bd581dcfc31930c6a09beb1e24f2e8
parentcfaacebb010cafe89956262463773e5543707cc3
parentc1782ec626fcb977b10e0e4f5f02f738b2b89a92
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle