Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:42:31 +0000 (09:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:42:31 +0000 (09:42 +0800)
commitf7551c2e62e29a7d3d0036d2ed3b0e55a4f117a0
tree835b4de6486416f85fe2f3cfea551e206da8431f
parent8ca9539be5d75a139fe17712ce8eb65e45cff0f8
parentd6c673ed4efa58beda4053d9ad644badf9650529
Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle