Merge branch 'MDL-39477-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 May 2013 03:12:43 +0000 (11:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 May 2013 03:12:43 +0000 (11:12 +0800)
commit0f1f60136858622778ef1012f4d7cb9c7ac83943
treed7e49bc22ef2e6723cfa6ec8eebabafbcc9fca0b
parentcb7c21af807519dc697ce4453e61e1eb650e95c2
parent67e01a5f5fe0a99930683d7e7030652952c32ebd
Merge branch 'MDL-39477-master' of git://github.com/FMCorz/moodle