Merge branch 'MDL-29817' of https://github.com/rushi963/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jan 2016 23:51:06 +0000 (00:51 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:24 +0000 (10:15 +0800)
commit3c415f13b811b7d01a6cce669680fd9d4c4ecc1d
tree897728380260cf9b6afef47e1e8216c7fe5bf2a4
parent6e38f41d8e47f224dff2c8ce0d0dd4e349e6645a
parent32f2116b0808c04fc713325bb04a1767cfd991aa
Merge branch 'MDL-29817' of https://github.com/rushi963/moodle