Merge branch 'MDL-38452-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
commit0ab296bd10eac28dace038e6dab76a2aa723e3c1
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 06:08:24 +0000 (8 14:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 06:08:24 +0000 (8 14:08 +0800)
tree8e2663e0fc822cdb8aa6b647f16b6dc400238a87
parent99a66861b748450f42bb12f3aedc9d109ee547b8
parent6c402aa73d6add3543a054f02e5d9a8f8652d44b
Merge branch 'MDL-38452-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE