Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)
commit20ac3aa5e5357c4a21065c2d4821687674742430
tree7e01b417aac74da098ca47341b1a13abc3a5082f
parentcae0c46b9b704949bb38965501382f961780969f
parentea99201d7d17f7fb095271c72565c4ff11eff8f3
Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle