Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:23:22 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:23:22 +0000 (14:23 +0800)
commitc8171c1d72c430ccb4554a50614fb148ffd66c2f
tree130c1d7e2fb5b483454e71193f53c57a91cc10e2
parentcbae4e39ea3cc328d78a5645a0c4bc2b8954e8d9
parentd1bb9ea917733d47874c5505ab415dbf1cb8cf9d
Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle