Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 05:47:00 +0000 (13:47 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 05:47:00 +0000 (13:47 +0800)
commitd62cddc5695204894ee1ad633b4714316bbfac63
tree11ae381b7f652b998b56da136bf73e18efca7393
parent10b44ec93d6b40a499327bf631e99d312b171a07
parentc58d1e0c24595d0f8e8f2412dde5abd83dd711b5
Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle