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)
commitad84f8f9acb3ab54dfd307d4454b1d4e5e16d72d
tree548af9027a87d97294b91c77e7ee5a6fef6086ad
parent0ae1b8a294eb4ffd470d8d99ce9cfcf0b76ffc85
parent6f55ce1893ceb2b7d0166bca7c458aca4d3c4696
Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle