Merge branch 'w51_MDL-36893_m25_mnetestrict' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:53:14 +0000 (13:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:53:14 +0000 (13:53 +0800)
commit8057d3ee777f457b58e7e9c900ae9267280a0461
tree801b5c055160101d45d594b0d6567dc779fdab32
parent6f4cf4656eff4e689f62ecc88fc1df2a073d15d9
parent63a15b38ad09924a946c8ba9aa7427d0ea927dce
Merge branch 'w51_MDL-36893_m25_mnetestrict' of git://github.com/skodak/moodle