Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 03:26:28 +0000 (11:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 03:26:28 +0000 (11:26 +0800)
commitea746c01668a1e832fb6d2612a0627bdee1f0310
treea60be8ee71a44ff0c24a94106f1e932831498c1e
parent0d9121a1c44bda6d0cce226f8f54f461c7730367
parent77755451979eee5e2d0154864c0ccfe998f3d81b
Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle