Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Feb 2015 05:48:54 +0000 (13:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Feb 2015 05:48:54 +0000 (13:48 +0800)
commitf13e8ad04168574574d5be2995502d849109d3f9
tree919d013abf35530933f8e5c92caafc8c1a0e297f
parentc6bcbad07a7fd437991ee7a2a1a98973949fac43
parent49faeef6bb9e3455b040d4ad446109e2050abf63
Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle