Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)
commitcb1bc5eb6beac93c482b986daa7eba1671a6c592
treedeb4e1ed7e82d0018e8c50c6f3625d11b186b6df
parentf6dbc2bb9c7d386c0fa248ddbab3187a9d42e220
parent452beca98df79f0499c72bdc8ae571853fb4130e
Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle