Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:49:42 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:49:42 +0000 (14:49 +0800)
commit6064e5cc006de79535b5ace1a97ec5a8029c3b67
tree919bff193840e89153d6a275bb02d8484bf7ab66
parent5432ccec646b48ce34e634b5d8972afb03522ef7
parent3b086e309485d1050fc8c103313db2206f829a5d
Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle