Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)
commit2cd64c93a07438485c7aee6d362f8b0bb0d47dbf
tree3186c0844a5ac745fdd0a4b93cbc1c637cc9d9a1
parenteb5942ea9d2199bd921c832174147716e4bcba28
parentb8ad1728d8eca4a8c97b0d56b4597d0c72db9935
Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle