Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 05:02:38 +0000 (13:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 05:02:38 +0000 (13:02 +0800)
commit278c280e8f0aede2494d46f48e04fd743f78d92b
treea6e4d88640bbbe826d0305eaab38f9b0589ae62e
parent5fbfc955d8400be784cc9a8f20d35e9bc5e35c9f
parent7b333271262b00789addaa04ebd99d1765e822b4
Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle