Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:41:21 +0000 (14:41 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:41:21 +0000 (14:41 +1200)
commitbf0cdbcf8ae0a1a44a0dc2d6908dc081138747d7
tree8cbf10469290bc81c57a8f07aa1990d34241c977
parent111f5291f9437bb7a0f9f9beb24d2453fce6b48d
parentf815e4cbdfb665dd281b7c3e180334037250cd66
Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle