Merge branch 'MDL-46398-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 09:26:25 +0000 (10:26 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 09:26:25 +0000 (10:26 +0100)
commitb0917db5eed9d6fe0229804374200acf37206808
tree7b1b1b33a5cbc6085c5aea582cbc76ffcaef5837
parent0c8699c8a9f093eb57b8ac10662dd59ae3718a1c
parent959dd36783781adddc1ed389752df4e9eb7d17ec
Merge branch 'MDL-46398-master' of git://github.com/junpataleta/moodle