Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 22 May 2013 01:06:29 +0000 (09:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 22 May 2013 01:06:29 +0000 (09:06 +0800)
commit49125bc5095cb651be710830ccba743d86ed460f
tree9c4e3d2f88a31525d369b46a1c33b37b1bb5b1f3
parent65fc4c39a931e3c2f81f6f441c6871afadc8ba7c
parent67202e2f2733adaefc5ca682636596f766fb610d
Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle