Merge branch 'MDL-29872_c_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
commit0686d3dc4c1ef1e1207b75255e7cd2c67eb4e68d
authorSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:12:37 +0000 (13 11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:12:37 +0000 (13 11:12 +1200)
treea46cedabc4e1c9b081a907b2a87594873130cc21
parent7f2d81c7b6789fd71c89f664f0571a2f2073ce17
parent8eb614d4bb4a80ed51520bca528530914082136f
Merge branch 'MDL-29872_c_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE