Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2015 09:28:31 +0000 (11:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2015 09:28:31 +0000 (11:28 +0200)
commit22e97e64136d29236a908aa8c9f13ea121d5864d
tree6278a11218a8d498c5b988ba2b4a5c964c2e3f58
parent8c55a50dbaa013fe578b34748222b8e75f259e73
parentba523bf5c3769eabd892bf2a23c2efbb0545168c
Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle