Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)
commitc3f185949fd8481e0f1a41fec83c2c77fecb7c8e
tree16d0ef7ee52fc42f81dd15d9aea8af6fa5ff3eb5
parente8c3f32f83b7672cc332c4970bae25d5a058fc46
parent65c7713115538695a0337e1a89a1bbd5406b19ad
Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle