Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)
commit79149e85fbd4ae3dfa8eef44209b0ff6bf681826
tree56c2fd24c4bf24d3fe2031f0b58f1903eec1ff73
parent67016a4d392a385d33f9f067a8763ae52fe33680
parent7c9753a71359571da026f32fccc41d03d9a4b47a
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle