Merge branch 'MDL-10115-master' of git://github.com/xow/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:03:21 +0000 (16:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:03:21 +0000 (16:03 +0800)
commit582abd94141e1254c44ced8e8bfe37d20159c569
tree6e8534e28ac1c9e9188f3759469a921eac6cf3fb
parent2ef26ad94f36ad2bab5b5976e07c4d863a96ff2a
parent3e40c056e801035ab78c899e4e1a9bcdf10d340c
Merge branch 'MDL-10115-master' of git://github.com/xow/moodle