Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 06:02:31 +0000 (14:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 06:02:31 +0000 (14:02 +0800)
commit35f155519e950d1c67a75c979fe51ca811d7f765
tree885fa7570bf28001e0273c9c3f34bc46d04a324d
parent2e0b17051c98a4c8a2081ee4458d4e1a43a684c9
parentc7289da7eb83fa3366249128b0366edceda297a7
Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle

Conflicts:
lang/en/admin.php
lang/en/admin.php
lang/en/moodle.php