Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle
commit34e46d7556e8289440da0d4abfc1d87d8de560ee
authorDamyon Wiese <damyon@moodle.com>
Tue, 30 Apr 2013 07:51:12 +0000 (30 15:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 30 Apr 2013 07:51:12 +0000 (30 15:51 +0800)
tree918fd48fd040ee20115e86feaf05fd76b52f4b73
parent7a286a0d6d49fc5eb641108ba0902307f648b214
parent1977123ea571c2eb2d5661beb57cffdba626ad01
Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle