Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)
commitc5eef789b92dd54459920ca476b6305d35c32e64
tree7af500665faffe64b1fe9e835f8ee841abd60d92
parent953eb35c84066ca2d161f23183ea807a457f05d0
parentfdb68112242f4829e636284b62dbc0c98e0774bd
Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle