Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)
commita46b0575726221038289b4eba618300f2bf34e3a
treed61d3377915568ae79c4794f95f9c5b360c6e2c6
parent5904a6abe32cfbb408ddcd40175021cc36b87d1e
parent5cfaaf2d7a7a119f4b7c07e8bb784775a84b020e
Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle