Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 10:55:27 +0000 (10:55 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 10:55:27 +0000 (10:55 +0000)
commitbcc4dc3eabde8d77074ae74f181278807204f348
treecc3837d4ca43cc89afdb465eecd83bf7e5a4851b
parentd148da7e56f43e1f5496b0d587b913127a64d4a0
parent03c39daad8e52515cff616b59dfc7dc64f22eafd
Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle

Conflicts:
backup/util/ui/renderer.php
backup/util/ui/renderer.php