Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 06:58:48 +0000 (14:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 06:58:48 +0000 (14:58 +0800)
commitc4006c851ab4d4aeff24302bfafcebd46c3770bd
tree6baf3606df87dc8ca13b2c8f6d435d93002a26ce
parent26115c284ea86f93fa95ffa613070789454e73d6
parent99c2ee6f9b49e3f59edb9a0ebf72905bbcd54a62
Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle