Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 22:00:16 +0000 (11:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 22:00:16 +0000 (11:00 +1300)
commit5252ec82a238e8e4ac3eb21bc00f82810d29ac11
treef21dcde8b1902ab2c34add2d999e1d59c686bb4f
parent02adb1e30d33731e9b6bd012cb6ea90baf1ea205
parent92fa81d387ffd9fc1cf28ef5ae90682ea8c19304
Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle

Conflicts:
version.php
lang/en/admin.php
lib/adminlib.php
version.php