Merge branch 'MDL-50956' of git://github.com/bostelm/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:20:11 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 11 Aug 2015 05:20:11 +0000 (13:20 +0800)
commitb84129b11e285bcfe58799ade572ed41f60ed774
tree187e5d74ca13c4d7a31cf3923a6f05554b9b51a4
parent8c497d8d9f0bbe52dc06944ded201f5c8bfbfb1b
parentafd9a921fa1f1a2e1921b3d3cea381c0bdaf225f
Merge branch 'MDL-50956' of git://github.com/bostelm/moodle