Merge branch 'MDL-42617' of git://github.com/jleyva/moodle
commit753ce05b8c813e2ad2f043a429b12a5f92a62382
authorMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 05:14:35 +0000 (4 16:14 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 05:14:35 +0000 (4 16:14 +1100)
tree69e38229819109d941cf523a2d285fb12d2f0f8c
parentd04bea30dae4de244e0fbdba2602791eda198d91
parent00461045a95dd019a2fb994f3247ec251f343d65
Merge branch 'MDL-42617' of git://github.com/jleyva/moodle