Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)
commitd3b5017940af45c77c3b290a9ff12cd0441ceba9
tree14cdef8488356e4e4f2c422a6bdb860ce2abbd83
parent7b6464bf9d5ff3001de94dfb3186e40bf86ab3c6
parentfb95da6f5bd69193dd35c217e7c710aec32342ee
Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle