Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 15:46:34 +0000 (15:46 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:33:27 +0000 (11:33 +0000)
commit7b58b245bf6b96ee1572f13b9d98bd1b9e8be77e
tree1990bf14b21c3fcbe8b9211ada50247f785a2a69
parent8c0f7298b665df1027329c720961f7779c170f69
parent95d1a366ea1cfb6ad50c389a09efa41ad610785d
Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle