Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)
commit88457992baa1368b48aa79cdf6c03f4a58cf777e
tree94df201eefa88325c075d18eda60bcdc3abe69d0
parent4198f7f9037cf259ace3ecd0a5f1c686aafc37da
parent6a27439b8f2ecdb4501f7b4a106374d8122dc74d
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle