Merge branch 'MDL-44440_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commitf9835ffed030118cc1349f7bb8894ae06f29a3a0
authorDan Poltawski <dan@moodle.com>
Mon, 10 Mar 2014 05:45:27 +0000 (10 13:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Mar 2014 05:45:27 +0000 (10 13:45 +0800)
tree8d20db6ebb7fce456cc3eff047474f0b9f40cf54
parentaacc48a7e67dce3dca169aefc369c9e4ad616531
parentd295418ee631baa3309bae604a37131f117cef02
Merge branch 'MDL-44440_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE