Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle
commit430529bde80153af83e6ffed0f745fa8c9cdad96
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:50:44 +0000 (19 13:50 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:50:44 +0000 (19 13:50 +0800)
tree52055740559a44d806edb3228c53e120144bde9f
parentdd924ea9dbc620d2df947e8183387453fcb0ad74
parent9eea8566320fcb543082213cccebf0034e6bdb65
Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle