Merge branch 'MDL-46498_master-fix' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:29:05 +0000 (13:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:29:05 +0000 (13:29 +0800)
commitf9f1cbbd7f5c2264378a20173b8b4761c43f3166
tree3855c56b15e23aa6dff87872e070df0079eb3d24
parent75cb0ffffe5197de09fc72350c37072cd9d910b8
parent3f94c97a99f94f6f9c629353529afd00e952b3fa
Merge branch 'MDL-46498_master-fix' of git://github.com/markn86/moodle