Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)
commit9855770d6cebbf6e8bcaff32c47ce5b242d0318b
tree231899e3c397d8b4bc4add34005de8d12d61405a
parent998c5996e0da14fa42ba356ad2204cad37d23b68
parent2c1065f7a9be7ba92a352059f17e391f84d8c807
Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle