Merge branch 'MDL-50304_28' of https://github.com/jinhofer/moodle into MOODLE_28_STABLE
commitd0be17a7492e7cd2db9299a6d9d65b50aa4f24bc
authorDan Poltawski <dan@moodle.com>
Mon, 1 Jun 2015 12:21:57 +0000 (1 13:21 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Jun 2015 12:21:57 +0000 (1 13:21 +0100)
tree27d40131cea82c06260f5c5499eb85f46d0622ef
parentc71949dc534449e35749e4be4cb6bec52cd1136b
parentfb06f2a87c0aee7fc97e95587e92dc150234020e
Merge branch 'MDL-50304_28' of https://github.com/jinhofer/moodle into MOODLE_28_STABLE