Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle
commit1a1949437b8aa653a8eb117da31dab5163462911
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 09:37:24 +0000 (9 17:37 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 09:37:24 +0000 (9 17:37 +0800)
tree4215aa192382bdf17e90df06e9591344ca5a8040
parent21fd2384dee574e983342c55ceeb59594925d98c
parent16ad61bf552ef2077d565237290ef11a26ec9cab
Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle