Merge branch 'MDL-47712-m28-master' of git://github.com/dthies/moodle into MOODLE_28_...
commit54fbcc3105f654dea07930b93da407375ab62c97
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:40 +0000 (16 10:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:40 +0000 (16 10:33 +0800)
tree48c859e6997db73daec16d923e72752ff16a52b5
parentc35f3e97dac57c49369101b5cefc74f7d3477282
parent55526a8a5373ff8a96751b672e5c89f660ff1b68
Merge branch 'MDL-47712-m28-master' of git://github.com/dthies/moodle into MOODLE_28_STABLE