Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 08:16:23 +0000 (19:16 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 08:16:23 +0000 (19:16 +1100)
commit8be0ca758cecc56affe84dbdb6b5a2b24198340b
treef2ede2f1126fa4e527b40a30b588aa94a839d63f
parentdb6767ae475d28bb76ba589fa1a62785e86231a3
parentfa3f7b972c5f1b3c50f8800c58d280dc3a3ed891
Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle