Merge branch 'MDL-46868_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit3fda0a97367ac8bbb7813a509ee29ac1b4a3aa4b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:40:48 +0000 (26 01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:40:48 +0000 (26 01:40 +0200)
tree966d4db70e34d77832b215604fad62dddd12322c
parent0047e4612ca50ae8f63dd15d6c743e57af70ff94
parent6527b097e8ac7b386d68d4949f00427c9c6dbaa9
Merge branch 'MDL-46868_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE