Merge branch 'MDL-40389_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE
commitdee6316364013182b357925bafe7fc52034be27c
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 07:53:06 +0000 (2 15:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 07:53:06 +0000 (2 15:53 +0800)
tree698fdba0c1d0e00edb3762be87071dff49bb9eda
parentf6b1260812bcf93e38a6cddddfd7565d37d08715
parent11ffc395f4c0368758e5131ed6a455f88b58cf9a
Merge branch 'MDL-40389_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE