Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:58:47 +0000 (14:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:58:47 +0000 (14:58 +0800)

Trivial merge