Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:59:44 +0000 (15:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:59:44 +0000 (15:59 +0200)
commit034544ffda012ad950f12400512f9579fb6c7671
treecc82f5f82d27e4c2797b9141aa9d6fd3e401eb3b
parent27600832aaaa5b1d722262540b09e3e0bc77aa8f
parentaf0fc6a2549a5a54969e53bf34740f34c1b00763
Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle