Merge branch 'MDL-47667' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:00:22 +0000 (13:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:00:22 +0000 (13:00 +0800)
commit8ae6df379895df3682b8e778de29c3265780215e
tree812817d8a5d65d130f5bd328e442cf75e657d66a
parent2fdb4c6b0095e74e4309f7a0ea6211fd9410ac8f
parent01e7c3bf4ee708057a20638f75f75a7835cd1290
Merge branch 'MDL-47667' of git://github.com/timhunt/moodle