Merge branch 'MDL-45833_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commitd183fbaf60dbca74fdbbd572ee2294e1f56a1a37
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 12:27:18 +0000 (30 13:27 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 12:27:18 +0000 (30 13:27 +0100)
treeb8917b6d305e8506b0b0c994652e973242078ca2
parent0d0552d430fe3bb7e4c8bce4d900d795c23facb7
parent2427ceef6296811039d61e078fad5126f12f234b
Merge branch 'MDL-45833_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE