Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:28:38 +0000 (12:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:28:38 +0000 (12:28 +0100)
commitcd580ee33784c3421610aff567dec8a60a302293
tree69188589fac4b2b2fb30fc14621c8a2feea0b70d
parente2a472e024048af1d7591c43c86c7f204bef7334
parentd19de800ed8b967a166de2ea3e18941496e63c9b
Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle