Merge branch 'MDL-48949_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE
commit0b331a73c6a96c702adce8910979e1133123e030
authorDan Poltawski <dan@moodle.com>
Thu, 22 Jan 2015 17:53:23 +0000 (22 17:53 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Jan 2015 17:53:23 +0000 (22 17:53 +0000)
treeed883eccdf58b7c8cf5a84a0e19e5a553892d6d0
parenta1d1479ff1c41b70e6c2c8821302fee87d46ae61
parenta52b56b7198d6e8505249762a7e46dd29d5be9ce
Merge branch 'MDL-48949_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE