Merge branch 'MDL-50642_29' of https://github.com/ecampbell/moodle into MOODLE_29_STABLE
commit9ac618ebfeb614ae4ebb802ce6e181ea77a02e54
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 20:38:01 +0000 (11 22:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 20:38:01 +0000 (11 22:38 +0200)
treea5dcc9d04b393922e1ba05442bc997523d89ce99
parent3c78c0df57b155d6d497ecd24e88e1ac81108db3
parent894d2d2b3b6829348fa18e93526fe52f1abb4ec1
Merge branch 'MDL-50642_29' of https://github.com/ecampbell/moodle into MOODLE_29_STABLE