Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)
commit88a4cb473439f5a2875260368b92fac1bb808c12
treef701dd33b5993bd9adb20cbff982096aab0b1f22
parentd0b63cbde580750e116d2c4b2832eda4ae0db907
parentd8a55f59bd2d333ef0107a30e5081f6ebca6b998
Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle