Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 02:48:47 +0000 (10:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 02:48:47 +0000 (10:48 +0800)
commit35a8f0cb7762cdb555554167a42d57150e309e48
treeb8931304b5efcb2fb951cbc203510d7d1419838e
parenta13ee8e18a139ffdd44bdc482777125ae2f53a62
parent46af2845d09bae9bbcc73009871c70732ba27328
Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle

Conflicts:
admin/tool/capability/index.php
admin/tool/capability/index.php