Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:51:30 +0000 (17:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:51:30 +0000 (17:51 +1200)
commit36671670e117ee487d7c19fb545bb06acd4c9878
tree60127538b228951bfe070e21265332680eff7b2f
parentd2132f02e2adfd67a0d2efd617fff1d3c0e0fab9
parentfafad009f34a0b4abddf312c4ca2d2667e2a485a
Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle