Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle
commitd8e98c3178a3aeae0196c5f520d71d7bea3ac5bc
authorDamyon Wiese <damyon@moodle.com>
Fri, 24 Oct 2014 07:38:33 +0000 (24 15:38 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:49:17 +0000 (24 11:49 +0200)
treeb24b69774b11aa8dbba5a7a60dea4c6070db4008
parent681276aad232869a3068570ecd42ff7dcb80fae2
parent2eb60f110d561c291da3aa53030e12af713c7c84
Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle