Merge branch 'MDL-44941-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commitf588d0efad0fb37cfbf018b35a2199cae84e0548
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 02:30:45 +0000 (16 10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 02:30:45 +0000 (16 10:30 +0800)
treec19326a1aea0efa6fa0badb07172b89d0628f21a
parent1c5bdb54b74cfb7077ffc9404c7459ad44398f45
parent74b89ac031229584f1a02cc7053474de59f243d5
Merge branch 'MDL-44941-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE