Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 02:08:28 +0000 (10:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 02:08:28 +0000 (10:08 +0800)
commitf8793245e853c475e6cca347e81fc55089fa187f
tree9e6c1c7c4c1528e1cee3b050c87a8b568c454f18
parentaf03e18f48975f1690e7f15df318863566017931
parent680482d14a9bcc02f87881aff3958d21aeb96c56
Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle