Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:29:49 +0000 (15:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:29:49 +0000 (15:29 +0800)
commitcbd91e23e9917b9f8ee92e9dc4c81dbf03d49e55
tree192b7528a150f8ff1ffeefcc1d5c392c4a866484
parentac43f963062dcb0aaff06bd357a572f2b452d611
parentc3d2fbf9cdd5922be0c69c76639b794da1ccf1d7
Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

Conflicts:
version.php
lib/outputlib.php
lib/upgrade.txt
version.php