Merge branch 'MDL-45290-master-fix' of http://github.com/jethac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 6 May 2014 03:23:39 +0000 (11:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 6 May 2014 03:23:39 +0000 (11:23 +0800)
commitf35bfa2cff67d00a351b0eae7414022b2c049e42
treef3b481327fe0e0395c82e410c8f6bf0097352a11
parent4644e7d067a332658e004fcc3a5cf946df887e70
parentfe778267f2a3840afcd88beeb2ca3fe2cb298b76
Merge branch 'MDL-45290-master-fix' of github.com/jethac/moodle