Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:07:34 +0000 (16:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:07:34 +0000 (16:07 +0800)
commita2574f3d4695dcaa6f074190d1177f9721f70c38
tree8f24e8d1f6c6738d12874c5a2b51056612c77c40
parentde049d9d26c1aa593114d0ca5abd615bb6f8a67d
parent59d52284653ee9c0bdf48a02ac18dbec4900aea7
Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle