Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)
commit94dab2abb3a32712ee23d489b592434ee641592e
treef5f75b9a47bee877ba55914edfd8cbb0db560c83
parent17af896c4b257b32977d1549c44400a485e9af5b
parent8538c562816e4eb8663e667c84b46d8eea558e4e
Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle