Merge branch 'MDL-45596-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 09:50:55 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 09:50:55 +0000 (10:50 +0100)
commit772d658f1d879874fb8ed47e2510ff97db7cbdee
tree2018b9342c04ad64c136e3563945e2c3c1903629
parentde5009f4a293e6c8d09ab4c3d05107275c389e56
parentaf2a1e4e3386151ed35dc7f51e3100db77cc2400
Merge branch 'MDL-45596-master' of git://github.com/FMCorz/moodle