Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle
commit2ae00d0d3c324834c3ff691569a722810f611880
authorDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:24:04 +0000 (11 14:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:24:04 +0000 (11 14:24 +0800)
treec2ba0eea057f95bab2ba8f7d0b34d9de615c04a3
parentacd561c66a2b84303552c865747759f9597c4164
parent6b219310cf269df209a7b39e1003b1266a7329fb
Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle
lang/en/moodle.php
lib/upgrade.txt