Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)
commita92008ed25b9a9de884e664c5d5570b1163bd814
treed96b7453f91ca557b923dcdea049d0faaf4b3c5b
parentaed3a3430f2cbc82c1d380cd3c316f8e4373e268
parent0c5481e43d64afdbfab0841346a9f8c1ff8092c8
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle